kopia lustrzana https://github.com/friendica/friendica
commit
a3152a96c2
|
@ -219,7 +219,7 @@ class App
|
|||
$this->logger = $logger;
|
||||
$this->config = $config;
|
||||
$this->profiler = $profiler;
|
||||
$this->basePath = $this->config->getCache()->get('system', 'basepath');
|
||||
$this->basePath = $this->config->get('system', 'basepath');
|
||||
|
||||
if (!Core\System::isDirectoryUsable($this->basePath, false)) {
|
||||
throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');
|
||||
|
|
|
@ -57,13 +57,14 @@ class JITConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAdapte
|
|||
// manage array value
|
||||
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
|
||||
|
||||
$this->in_db[$cat][$key] = true;
|
||||
return $value;
|
||||
} else {
|
||||
|
||||
$this->in_db[$cat][$key] = false;
|
||||
return '!<unset>!';
|
||||
if (isset($value) && $value !== '') {
|
||||
$this->in_db[$cat][$key] = true;
|
||||
return $value;
|
||||
}
|
||||
}
|
||||
|
||||
$this->in_db[$cat][$key] = false;
|
||||
return '!<unset>!';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -57,13 +57,14 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
|
|||
// manage array value
|
||||
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
|
||||
|
||||
$this->in_db[$uid][$cat][$key] = true;
|
||||
return $value;
|
||||
} else {
|
||||
|
||||
$this->in_db[$uid][$cat][$key] = false;
|
||||
return '!<unset>!';
|
||||
if (isset($value) && $value !== '') {
|
||||
$this->in_db[$uid][$cat][$key] = true;
|
||||
return $value;
|
||||
}
|
||||
}
|
||||
|
||||
$this->in_db[$uid][$cat][$key] = false;
|
||||
return '!<unset>!';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -55,11 +55,12 @@ class PreloadConfigAdapter extends AbstractDbaConfigAdapter implements IConfigAd
|
|||
// manage array value
|
||||
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
|
||||
|
||||
return $value;
|
||||
} else {
|
||||
|
||||
return '!<unset>!';
|
||||
if (isset($value) && $value !== '') {
|
||||
return $value;
|
||||
}
|
||||
}
|
||||
|
||||
return '!<unset>!';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -71,10 +71,11 @@ class PreloadPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfig
|
|||
// manage array value
|
||||
$value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
|
||||
|
||||
return $value;
|
||||
} else {
|
||||
return '!<unset>!';
|
||||
if (isset($value) && $value !== '') {
|
||||
return $value;
|
||||
}
|
||||
}
|
||||
return '!<unset>!';
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
@ -439,7 +439,7 @@ class Worker
|
|||
|
||||
Logger::log("Process ".$mypid." - Prio ".$queue["priority"]." - ID ".$queue["id"].": ".$funcname." - done in ".number_format($duration, 4)." seconds. Process PID: ".$new_process_id);
|
||||
|
||||
$a->getProfiler()->saveLog("ID " . $queue["id"] . ": " . $funcname);
|
||||
$a->getProfiler()->saveLog($a->getLogger(), "ID " . $queue["id"] . ": " . $funcname);
|
||||
|
||||
$cooldown = Config::get("system", "worker_cooldown", 0);
|
||||
|
||||
|
|
Ładowanie…
Reference in New Issue