use Friendica\Content\Text\HTML;
use Friendica\Core\Config\Capability\IManageConfigValues;
use Friendica\DI;
+use Friendica\Model\User;
use Friendica\Module\Response;
use Friendica\Network\HTTPException\FoundException;
use Friendica\Network\HTTPException\MovedPermanentlyException;
$load = System::currentLoad();
if ($load) {
if (intval($load) > $maxsysload) {
- $this->logger->warning('system load for process too high.', ['load' => $load, 'process' => 'backend', 'maxsysload' => $maxsysload]);
+ $this->logger->notice('system load for process too high.', ['load' => $load, 'process' => 'backend', 'maxsysload' => $maxsysload]);
return true;
}
}
* @param integer $depth How many calls to include in the stacks after filtering
* @param int $offset How many calls to shave off the top of the stack, for example if
* this is called from a centralized method that isn't relevant to the callstack
+ * @param bool $full If enabled, the callstack is not compacted
* @return string
*/
- public static function callstack(int $depth = 4, int $offset = 0): string
+ public static function callstack(int $depth = 4, int $offset = 0, bool $full = false): string
{
$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
while ($func = array_pop($trace)) {
if (!empty($func['class'])) {
- if (in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray',
+ if (!$full && in_array($previous['function'], ['insert', 'fetch', 'toArray', 'exists', 'count', 'selectFirst', 'selectToArray',
'select', 'update', 'delete', 'selectFirstForUser', 'selectForUser'])
&& (substr($previous['class'], 0, 15) === 'Friendica\Model')) {
continue;
// Don't show multiple calls from the Database classes to show the essential parts of the callstack
$func['database'] = in_array($func['class'], ['Friendica\Database\DBA', 'Friendica\Database\Database']);
- if (!$previous['database'] || !$func['database']) {
+ if ($full || !$previous['database'] || !$func['database']) {
$classparts = explode("\\", $func['class']);
- $callstack[] = array_pop($classparts).'::'.$func['function'] . '(' . $func['line'] . ')';
+ $callstack[] = array_pop($classparts).'::'.$func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
$previous = $func;
}
} elseif (!in_array($func['function'], $ignore)) {
$func['database'] = ($func['function'] == 'q');
- $callstack[] = $func['function'] . '(' . $func['line'] . ')';
+ $callstack[] = $func['function'] . (isset($func['line']) ? ' (' . $func['line'] . ')' : '');
$func['class'] = '';
$previous = $func;
}
}
/**
- * This function adds the content and a content-teype HTTP header to the output.
+ * This function adds the content and a content-type HTTP header to the output.
* After finishing the process is getting killed.
*
* @param string $content
if (is_bool($prefix) && !$prefix) {
$prefix = '';
} elseif (empty($prefix)) {
- $prefix = hash('crc32', DI::baseUrl()->getHostname());
+ $prefix = hash('crc32', DI::baseUrl()->getHost());
}
while (strlen($prefix) < ($size - 13)) {
*/
public static function getLoadAvg(bool $get_processes = true): array
{
+ $load_arr = sys_getloadavg();
+ if (empty($load_arr)) {
+ return [];
+ }
+
+ $load = [
+ 'average1' => $load_arr[0],
+ 'average5' => $load_arr[1],
+ 'average15' => $load_arr[2],
+ 'runnable' => 0,
+ 'scheduled' => 0
+ ];
+
if ($get_processes && @is_readable('/proc/loadavg')) {
$content = @file_get_contents('/proc/loadavg');
- if (empty($content)) {
- $content = shell_exec('uptime | sed "s/.*averages*: //" | sed "s/,//g"');
+ if (!empty($content) && preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
+ $load['runnable'] = (float)$matches[4];
+ $load['scheduled'] = (float)$matches[5];
}
}
- if (empty($content) || !preg_match("#([.\d]+)\s([.\d]+)\s([.\d]+)\s(\d+)/(\d+)#", $content, $matches)) {
- $load_arr = sys_getloadavg();
- if (empty($load_arr)) {
- return [];
- }
- return [
- 'average1' => $load_arr[0],
- 'average5' => $load_arr[1],
- 'average15' => $load_arr[2],
- 'runnable' => 0,
- 'scheduled' => 0
- ];
- }
-
- return [
- 'average1' => (float)$matches[1],
- 'average5' => (float)$matches[2],
- 'average15' => (float)$matches[3],
- 'runnable' => (float)$matches[4],
- 'scheduled' => (float)$matches[5]
- ];
+ return $load;
}
/**
* Checks if a given directory is usable for the system
*
* @param $directory
- * @param bool $check_writable
*
* @return boolean the directory is usable
*/
- private static function isDirectoryUsable($directory, $check_writable = true)
+ private static function isDirectoryUsable(string $directory): bool
{
- if ($directory == '') {
+ if (empty($directory)) {
Logger::warning('Directory is empty. This shouldn\'t happen.');
return false;
}
if (!file_exists($directory)) {
- Logger::warning('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
+ Logger::info('Path does not exist', ['directory' => $directory, 'user' => static::getUser()]);
return false;
}
return false;
}
- if ($check_writable && !is_writable($directory)) {
+ if (!is_writable($directory)) {
Logger::warning('Path is not writable', ['directory' => $directory, 'user' => static::getUser()]);
return false;
}
$temppath = BasePath::getRealPath($temppath);
// To avoid any interferences with other systems we create our own directory
- $new_temppath = $temppath . "/" . DI::baseUrl()->getHostname();
+ $new_temppath = $temppath . "/" . DI::baseUrl()->getHost();
if (!is_dir($new_temppath)) {
/// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
- mkdir($new_temppath);
+ @mkdir($new_temppath);
}
if (self::isDirectoryUsable($new_temppath)) {
if (DI::config()->get('system', 'tosdisplay')) {
$rulelist = DI::config()->get('system', 'tosrules') ?: DI::config()->get('system', 'tostext');
- $html = BBCode::convert($rulelist, false, BBCode::EXTERNAL);
-
- $msg = HTML::toPlaintext($html, 0, true);
+ $msg = BBCode::toPlaintext($rulelist, false);
foreach (explode("\n", trim($msg)) as $line) {
$line = trim($line);
if ($line) {
projects / friendica.git / blobdiff