bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Use a process identifier for logging that contains the pid (#5359)

Browse source
This commit is contained in:
Michael Vogel 2018-07-11 00:32:47 +02:00 committed by Hypolite Petovan
parent ef0e34adf3
commit 3792e2819d
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.php
View file

@ -193,7 +193,7 @@ class App
$this->query_string = ''; $this->query_string = '';
$this->process_id = uniqid('log', true); $this->process_id = System::processID('log');
set_time_limit(0); set_time_limit(0);

12
src/Core/System.php
View file

@ -203,6 +203,18 @@ EOT;
} }
} }
/**
* Generates a process identifier for the logging
*
* @param string $prefix A given prefix
*
* @return string a generated process identifier
*/
public static function processID($prefix)
{
return uniqid($prefix . ':' . str_pad(getmypid() . ':', 8, '0') . ':');
}
/// @todo Move the following functions from boot.php /// @todo Move the following functions from boot.php
/* /*
function killme() function killme()

4
src/Core/Worker.php
View file

@ -141,7 +141,7 @@ class Worker
if (Config::get('system', 'worker_daemon_mode', false)) { if (Config::get('system', 'worker_daemon_mode', false)) {
self::IPCSetJobState(false); self::IPCSetJobState(false);
} }
logger("Couldn't select a workerqueue entry, quitting.", LOGGER_DEBUG); logger("Couldn't select a workerqueue entry, quitting process " . getmypid() . ".", LOGGER_DEBUG);
} }
/** /**
@ -309,7 +309,7 @@ class Worker
$argc = count($argv); $argc = count($argv);
$new_process_id = uniqid("wrk", true); $new_process_id = System::processID("wrk");
logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id); logger("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." ".$queue["parameter"]." - Process PID: ".$new_process_id);