vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2025-12-07 09:36:05 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move of LOG folder from /app/front/log to app/log

Browse Source
This commit is contained in:
jokob-sk
2024-12-08 21:06:44 +11:00
parent cd9c4a2176
commit a7e35c4697
24 changed files with 90 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front/devices.php
View File

@@ -780,7 +780,7 @@ function handleLoadingDialog(needsReload = false)
// console.log('needsReload:');
// console.log(needsReload);
$.get('log/execution_queue.log?nocache=' + Date.now(), function(data) {
$.get('/php/server/query_logs.php?file=execution_queue.log&nocache=' + Date.now(), function(data) {
if(data.includes("update_api|devices"))
{

2
front/js/db_methods.js
View File

@@ -85,7 +85,7 @@ function renderList(
// Check if database is locked
function checkDbLock() {
$.ajax({
url: "log/db_is_locked.log", // Replace with the actual path to your PHP file
url: "/php/server/query_logs.php?file=db_is_locked.log",
type: "GET",
success: function (response) {

2
front/js/ui_components.js
View File

@@ -314,7 +314,7 @@ function updateModalState() {
setTimeout(function() {
// Fetch the content from the log file using an AJAX request
$.ajax({
url: '/log/execution_queue.log',
url: '/php/server/query_logs.php?file=execution_queue.log',
type: 'GET',
success: function(data) {
// Update the content of the HTML element (e.g., a div with id 'logContent')

2
front/log/.gitignore vendored
View File

@@ -1,2 +0,0 @@
*
!.gitignore

6
front/php/components/logs.php
View File

@@ -20,12 +20,12 @@ function renderLogArea($params) {
$content = file_get_contents($filePath);
}
// Prepare the download button HTML if filePath starts with /app/front
// Prepare the download button HTML if filePath starts with /app
$downloadButtonHtml = '';
if (strpos($filePath, '/app/front') === 0) {
if (strpos($filePath, '/app') === 0) {
$downloadButtonHtml = '
<span class="span-padding">
<a href="' . htmlspecialchars(str_replace('/app/front', '', $filePath)) . '" target="_blank">
<a href="' . htmlspecialchars(str_replace('/app/log/', '/php/server/query_logs.php?file=', $filePath)) . '" target="_blank">
<i class="fa fa-download"></i>
</a>
</span>';

25
front/php/components/logs_defaults.json
View File

@@ -11,7 +11,7 @@
}
],
"fileName": "app.log",
"filePath": "/app/front/log/app.log",
"filePath": "/app/log/app.log",
"textAreaCssClass": "logs"
},
@@ -23,7 +23,7 @@
}
],
"fileName": "app_front.log",
"filePath": "/app/front/log/app_front.log",
"filePath": "/app/log/app_front.log",
"textAreaCssClass": "logs logs-small"
},
{
@@ -34,7 +34,7 @@
}
],
"fileName": "app.php_errors.log",
"filePath": "/app/front/log/app.php_errors.log",
"filePath": "/app/log/app.php_errors.log",
"textAreaCssClass": "logs logs-small"
},
{
@@ -45,7 +45,7 @@
}
],
"fileName": "execution_queue.log",
"filePath": "/app/front/log/execution_queue.log",
"filePath": "/app/log/execution_queue.log",
"textAreaCssClass": "logs logs-small"
},
{
@@ -55,17 +55,6 @@
"filePath": "/var/log/nginx/error.log",
"textAreaCssClass": "logs logs-small"
},
{
"buttons": [
{
"labelStringCode": "Maint_PurgeLog",
"event": "logManage('app_front.log', 'cleanLog')"
}
],
"fileName": "app_front.log",
"filePath": "/app/front/log/app_front.log",
"textAreaCssClass": "logs logs-small"
},
{
"buttons": [
{
@@ -74,7 +63,7 @@
}
],
"fileName": "db_is_locked.log",
"filePath": "/app/front/log/db_is_locked.log",
"filePath": "/app/log/db_is_locked.log",
"textAreaCssClass": "logs logs-small"
},
{
@@ -85,7 +74,7 @@
}
],
"fileName": "stdout.log",
"filePath": "/app/front/log/stdout.log",
"filePath": "/app/log/stdout.log",
"textAreaCssClass": "logs logs-small"
},
{
@@ -96,7 +85,7 @@
}
],
"fileName": "stderr.log",
"filePath": "/app/front/log/stderr.log",
"filePath": "/app/log/stderr.log",
"textAreaCssClass": "logs logs-small"
}
]

2
front/php/server/db.php
View File

@@ -11,7 +11,7 @@
//------------------------------------------------------------------------------
// DB File Path
$DBFILE = dirname(__FILE__).'/../../../db/app.db';
$DBFILE_LOCKED_FILE = dirname(__FILE__).'/../../../front/log/db_is_locked.log';
$DBFILE_LOCKED_FILE = dirname(__FILE__).'/../../../log/db_is_locked.log';
//------------------------------------------------------------------------------
// check if authenticated

38
front/php/server/query_logs.php Normal file
View File

@@ -0,0 +1,38 @@
<?php
// ---- IMPORTS ----
//------------------------------------------------------------------------------
// Check if authenticated
require_once $_SERVER['DOCUMENT_ROOT'] . '/php/templates/security.php';
// Get init.php
require dirname(__FILE__).'/../server/init.php';
// ---- IMPORTS ----
//------------------------------------------------------------------------------
// Handle incoming requests
if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// Get query string parameter ?file=settings_table.json
$file = isset($_GET['file']) ? $_GET['file'] : null;
// Check if file parameter is provided
if ($file) {
// Define the folder where files are located
$filePath = "/app/log/" . basename($file);
// Check if the file exists
if (file_exists($filePath)) {
// Send the response back to the client
header('Content-Type: text/plain');
echo file_get_contents($filePath);
} else {
// File not found response
http_response_code(404);
echo json_encode(["error" => "File not found"]);
}
} else {
// Missing file parameter response
http_response_code(400);
echo json_encode(["error" => "Missing 'file' parameter"]);
}
}
?>

2
front/php/templates/timezone.php
View File

@@ -6,7 +6,7 @@
$configFolderPath = dirname(__FILE__)."/../../../config/";
$config_file = "app.conf";
$logFolderPath = dirname(__FILE__)."/../../log/";
$logFolderPath = "/app/log/";
$log_file = "app_front.log";