MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'hotfix-2.3.141'

pull/712/head v2.3.141
Iglocska 2015-10-13 10:52:11 +02:00
parent ab6ae4be67 c9bf8105e6
commit dbea871d5e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":140}
{"major":2, "minor":3, "hotfix":141}

6
app/Model/Server.php
View File

@ -1564,7 +1564,10 @@ class Server extends AppModel {
public function workerDiagnostics(&$workerIssueCount) {
$this->ResqueStatus = new ResqueStatus\ResqueStatus(Resque::redis());
$workers = $this->ResqueStatus->getWorkers();
$currentUser = get_current_user();
if (function_exists('posix_getpwuid')) {
$currentUser = posix_getpwuid(posix_geteuid());
$currentUser = $currentUser['name'];
} else $currentUser = trim(shell_exec('whoami'));
$worker_array = array(
'cache' => array('ok' => true),
'default' => array('ok' => true),
@ -1595,7 +1598,6 @@ class Server extends AppModel {
}
$worker_array['proc_accessible'] = $procAccessible;
return $worker_array;
}
public function retrieveCurrentSettings($branch, $subString) {