mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #2717 from annando/1608-bugfix-procrun

Browse source 
Bugfix: proc_run hadn't worked anymore due to the priority changes
This commit is contained in:
Tobias Diekershoff 2016-08-08 07:28:22 +02:00 committed by GitHub
parent 5a2ba1029e 65a09c67a0
commit cdc5b609ce
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
boot.php
View file

@ -571,6 +571,7 @@ class App {
$this->performance["start"] = microtime(true); $this->performance["start"] = microtime(true);
$this->performance["database"] = 0; $this->performance["database"] = 0;
$this->performance["database_write"] = 0;
$this->performance["network"] = 0; $this->performance["network"] = 0;
$this->performance["file"] = 0; $this->performance["file"] = 0;
$this->performance["rendering"] = 0; $this->performance["rendering"] = 0;
@ -1263,7 +1264,7 @@ class App {
function proc_run($args) { function proc_run($args) {
// Add the php path if it is a php call // Add the php path if it is a php call
if (count($args) && $args[0] === 'php') if (count($args) && ($args[0] === 'php' OR is_int($args[0])))
$args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php'); $args[0] = ((x($this->config,'php_path')) && (strlen($this->config['php_path'])) ? $this->config['php_path'] : 'php');
// add baseurl to args. cli scripts can't construct it // add baseurl to args. cli scripts can't construct it

3
include/dba.php
View file

@ -107,6 +107,9 @@ class dba {
$a->save_timestamp($stamp1, "database"); $a->save_timestamp($stamp1, "database");
if (strtolower(substr($sql, 0, 6)) != "select")
$a->save_timestamp($stamp1, "database_write");
if(x($a->config,'system') && x($a->config['system'],'db_log')) { if(x($a->config,'system') && x($a->config['system'],'db_log')) {
if (($duration > $a->config["system"]["db_loglimit"])) { if (($duration > $a->config["system"]["db_loglimit"])) {
$duration = round($duration, 3); $duration = round($duration, 3);