fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-1335 (pull request #7332)

Browse Source 
PMCORE-1335 ProcessMaker core should be use the native Laravel log mechanism

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly Rudy Gutierrez Pinto
2020-09-18 18:24:25 +00:00
committed by Julio Cesar Laura Avendaño
parent bddc70ef22 0b84bbae6f
commit 5e8d0a8f02
45 changed files with 751 additions and 1539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
workflow/engine/src/ProcessMaker/Core/JobsManager.php
View File

@@ -49,6 +49,7 @@ class JobsManager
'__SYSTEM_UTC_TIME_ZONE__',
'USER_LOGGED',
'USR_USERNAME',
'USR_TIME_ZONE',
'APPLICATION',
'INDEX',
'PROCESS',
@@ -126,6 +127,11 @@ class JobsManager
'constants' => $constants['user'],
'session' => $session,
'server' => $_SERVER,
'phpEnv' => [
'HTTP_CLIENT_IP' => getenv('HTTP_CLIENT_IP'),
'HTTP_X_FORWARDED_FOR' => getenv('HTTP_X_FORWARDED_FOR'),
'REMOTE_ADDR' => getenv('REMOTE_ADDR'),
],
];
}
@@ -148,6 +154,13 @@ class JobsManager
Propel::close();
Propel::init(PATH_CONFIG . "databases.php");
foreach ($environment['phpEnv'] as $key => $value) {
if (empty($value)) {
continue;
}
putenv("{$key}={$value}");
}
}
/**
@@ -195,12 +208,12 @@ class JobsManager
$this->recoverDataSnapshot($environment);
$callback($environment);
} catch (Exception $e) {
Log::error($e->getMessage() . ": " . $e->getTraceAsString());
$message = $e->getMessage();
$context = [
"trace" => $e->getTraceAsString(),
"workspace" => $environment["constants"]["SYS_SYS"]
];
Bootstrap::registerMonolog("queue:work", 400, $e->getMessage(), $context, "");
Log::channel(':queue-work')->error($message, Bootstrap::context($context));
throw $e;
}
});