keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add Monolog

Browse source
This commit is contained in:
Philipp Holzer 2018-12-30 21:42:56 +01:00 committed by Hypolite Petovan
parent 1d61645a16
commit fe8f0e0045
15 changed files with 363 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bin/auth_ejabberd.php
View file

@ -33,6 +33,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Logger;
use Friendica\Util\ExAuth; use Friendica\Util\ExAuth;
if (sizeof($_SERVER["argv"]) == 0) { if (sizeof($_SERVER["argv"]) == 0) {
@ -51,7 +52,9 @@ chdir($directory);
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__)); $logger = Logger::create('ejabberd');
$a = new App(dirname(__DIR__), $logger);
if ($a->getMode()->isNormal()) { if ($a->getMode()->isNormal()) {
$oAuth = new ExAuth(); $oAuth = new ExAuth();

6
bin/console.php
View file

@ -3,7 +3,11 @@
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new Friendica\App(dirname(__DIR__)); use Friendica\Core\Logger;
$logger = Logger::create('console');
$a = new Friendica\App(dirname(__DIR__), $logger);
\Friendica\BaseObject::setApp($a); \Friendica\BaseObject::setApp($a);
(new Friendica\Core\Console($argv))->execute(); (new Friendica\Core\Console($argv))->execute();

16
bin/daemon.php
View file

@ -32,7 +32,9 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__)); $logger = Logger::create('daemon');
$a = new App(dirname(__DIR__), $logger);
if ($a->getMode()->isInstall()) { if ($a->getMode()->isInstall()) {
die("Friendica isn't properly installed yet.\n"); die("Friendica isn't properly installed yet.\n");
@ -102,7 +104,7 @@ if ($mode == "stop") {
unlink($pidfile); unlink($pidfile);
Logger::log("Worker daemon process $pid was killed.", Logger::DEBUG); $logger->notice("Worker daemon process was killed", ["pid" => $pid]);
Config::set('system', 'worker_daemon_mode', false); Config::set('system', 'worker_daemon_mode', false);
die("Worker daemon process $pid was killed.\n"); die("Worker daemon process $pid was killed.\n");
@ -112,7 +114,7 @@ if (!empty($pid) && posix_kill($pid, 0)) {
die("Daemon process $pid is already running.\n"); die("Daemon process $pid is already running.\n");
} }
Logger::log('Starting worker daemon.', Logger::DEBUG); $logger->notice('Starting worker daemon.', ["pid" => $pid]);
if (!$foreground) { if (!$foreground) {
echo "Starting worker daemon.\n"; echo "Starting worker daemon.\n";
@ -160,7 +162,7 @@ $last_cron = 0;
// Now running as a daemon. // Now running as a daemon.
while (true) { while (true) {
if (!$do_cron && ($last_cron + $wait_interval) < time()) { if (!$do_cron && ($last_cron + $wait_interval) < time()) {
Logger::log('Forcing cron worker call.', Logger::DEBUG); $logger->info('Forcing cron worker call.', ["pid" => $pid]);
$do_cron = true; $do_cron = true;
} }
@ -174,7 +176,7 @@ while (true) {
$last_cron = time(); $last_cron = time();
} }
Logger::log("Sleeping", Logger::DEBUG); $logger->info("Sleeping", ["pid" => $pid]);
$start = time(); $start = time();
do { do {
$seconds = (time() - $start); $seconds = (time() - $start);
@ -191,10 +193,10 @@ while (true) {
if ($timeout) { if ($timeout) {
$do_cron = true; $do_cron = true;
Logger::log("Woke up after $wait_interval seconds.", Logger::DEBUG); $logger->info("Woke up after $wait_interval seconds.", ["pid" => $pid, 'sleep' => $wait_interval]);
} else { } else {
$do_cron = false; $do_cron = false;
Logger::log("Worker jobs are calling to be forked.", Logger::DEBUG); $logger->info("Worker jobs are calling to be forked.", ["pid" => $pid]);
} }
} }

5
bin/worker.php
View file

@ -6,6 +6,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Core\Update; use Friendica\Core\Update;
@ -28,7 +29,9 @@ if (!file_exists("boot.php") && (sizeof($_SERVER["argv"]) != 0)) {
require dirname(__DIR__) . '/vendor/autoload.php'; require dirname(__DIR__) . '/vendor/autoload.php';
$a = new App(dirname(__DIR__)); $logger = Logger::create('worker');
$a = new App(dirname(__DIR__), $logger);
// Check the database structure and possibly fixes it // Check the database structure and possibly fixes it
Update::check(true); Update::check(true);

3
composer.json
View file

@ -42,7 +42,8 @@
"npm-asset/jgrowl": "^1.4", "npm-asset/jgrowl": "^1.4",
"npm-asset/fullcalendar": "^3.0.1", "npm-asset/fullcalendar": "^3.0.1",
"npm-asset/cropperjs": "1.2.2", "npm-asset/cropperjs": "1.2.2",
"npm-asset/imagesloaded": "4.1.4" "npm-asset/imagesloaded": "4.1.4",
"monolog/monolog": "^1.24"
}, },
"repositories": [ "repositories": [
{ {

195
composer.lock generated
View file

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "51f7b3ab622038d7ef62ed03c06b48d0", "content-hash": "8cf7268fbcae8a22a518b9e7727eab84",
"packages": [ "packages": [
{ {
"name": "asika/simple-console", "name": "asika/simple-console",
@ -809,6 +809,84 @@
], ],
"time": "2018-09-01T15:05:15+00:00" "time": "2018-09-01T15:05:15+00:00"
}, },
{
"name": "monolog/monolog",
"version": "1.24.0",
"source": {
"type": "git",
"url": "https://github.com/Seldaek/monolog.git",
"reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"reference": "bfc9ebb28f97e7a24c45bdc3f0ff482e47bb0266",
"shasum": ""
},
"require": {
"php": ">=5.3.0",
"psr/log": "~1.0"
},
"provide": {
"psr/log-implementation": "1.0.0"
},
"require-dev": {
"aws/aws-sdk-php": "^2.4.9 || ^3.0",
"doctrine/couchdb": "~1.0@dev",
"graylog2/gelf-php": "~1.0",
"jakub-onderka/php-parallel-lint": "0.9",
"php-amqplib/php-amqplib": "~2.4",
"php-console/php-console": "^3.1.3",
"phpunit/phpunit": "~4.5",
"phpunit/phpunit-mock-objects": "2.3.0",
"ruflin/elastica": ">=0.90 <3.0",
"sentry/sentry": "^0.13",
"swiftmailer/swiftmailer": "^5.3|^6.0"
},
"suggest": {
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
"doctrine/couchdb": "Allow sending log messages to a CouchDB server",
"ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
"ext-mongo": "Allow sending log messages to a MongoDB server",
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
"mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
"php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
"php-console/php-console": "Allow sending log messages to Google Chrome",
"rollbar/rollbar": "Allow sending log messages to Rollbar",
"ruflin/elastica": "Allow sending log messages to an Elastic Search server",
"sentry/sentry": "Allow sending log messages to a Sentry server"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Monolog\\": "src/Monolog"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jordi Boggiano",
"email": "j.boggiano@seld.be",
"homepage": "http://seld.be"
}
],
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
"homepage": "http://github.com/Seldaek/monolog",
"keywords": [
"log",
"logging",
"psr-3"
],
"time": "2018-11-05T09:00:11+00:00"
},
{ {
"name": "npm-asset/cropperjs", "name": "npm-asset/cropperjs",
"version": "1.2.2", "version": "1.2.2",
@ -1019,22 +1097,6 @@
"require": { "require": {
"npm-asset/ev-emitter": ">=1.0.0,<2.0.0" "npm-asset/ev-emitter": ">=1.0.0,<2.0.0"
}, },
"require-dev": {
"npm-asset/chalk": ">=1.1.1,<2.0.0",
"npm-asset/cheerio": ">=0.19.0,<0.20.0",
"npm-asset/gulp": ">=3.9.0,<4.0.0",
"npm-asset/gulp-jshint": ">=1.11.2,<2.0.0",
"npm-asset/gulp-json-lint": ">=0.1.0,<0.2.0",
"npm-asset/gulp-rename": ">=1.2.2,<2.0.0",
"npm-asset/gulp-replace": ">=0.5.4,<0.6.0",
"npm-asset/gulp-requirejs-optimize": "dev-github:metafizzy/gulp-requirejs-optimize",
"npm-asset/gulp-uglify": ">=1.4.2,<2.0.0",
"npm-asset/gulp-util": ">=3.0.7,<4.0.0",
"npm-asset/highlight.js": ">=8.9.1,<9.0.0",
"npm-asset/marked": ">=0.3.5,<0.4.0",
"npm-asset/minimist": ">=1.2.0,<2.0.0",
"npm-asset/transfob": ">=1.0.0,<2.0.0"
},
"type": "npm-asset-library", "type": "npm-asset-library",
"extra": { "extra": {
"npm-asset-bugs": { "npm-asset-bugs": {
@ -1080,14 +1142,6 @@
"reference": null, "reference": null,
"shasum": "2736e332aaee73ccf0a14a5f0066391a0a13f4a3" "shasum": "2736e332aaee73ccf0a14a5f0066391a0a13f4a3"
}, },
"require-dev": {
"npm-asset/grunt": "~0.4.2",
"npm-asset/grunt-contrib-cssmin": "~0.9.0",
"npm-asset/grunt-contrib-jshint": "~0.6.3",
"npm-asset/grunt-contrib-less": "~0.11.0",
"npm-asset/grunt-contrib-uglify": "~0.4.0",
"npm-asset/grunt-contrib-watch": "~0.6.1"
},
"type": "npm-asset-library", "type": "npm-asset-library",
"extra": { "extra": {
"npm-asset-bugs": { "npm-asset-bugs": {
@ -1121,32 +1175,6 @@
"reference": null, "reference": null,
"shasum": "2c89d6889b5eac522a7eea32c14521559c6cbf02" "shasum": "2c89d6889b5eac522a7eea32c14521559c6cbf02"
}, },
"require-dev": {
"npm-asset/commitplease": "2.0.0",
"npm-asset/core-js": "0.9.17",
"npm-asset/grunt": "0.4.5",
"npm-asset/grunt-babel": "5.0.1",
"npm-asset/grunt-cli": "0.1.13",
"npm-asset/grunt-compare-size": "0.4.0",
"npm-asset/grunt-contrib-jshint": "0.11.2",
"npm-asset/grunt-contrib-uglify": "0.9.2",
"npm-asset/grunt-contrib-watch": "0.6.1",
"npm-asset/grunt-git-authors": "2.0.1",
"npm-asset/grunt-jscs": "2.1.0",
"npm-asset/grunt-jsonlint": "1.0.4",
"npm-asset/grunt-npmcopy": "0.1.0",
"npm-asset/gzip-js": "0.3.2",
"npm-asset/jsdom": "5.6.1",
"npm-asset/load-grunt-tasks": "1.0.0",
"npm-asset/qunit-assert-step": "1.0.3",
"npm-asset/qunitjs": "1.17.1",
"npm-asset/requirejs": "2.1.17",
"npm-asset/sinon": "1.10.3",
"npm-asset/sizzle": "2.2.1",
"npm-asset/strip-json-comments": "1.0.3",
"npm-asset/testswarm": "1.1.0",
"npm-asset/win-spawn": "2.0.0"
},
"type": "npm-asset-library", "type": "npm-asset-library",
"extra": { "extra": {
"npm-asset-bugs": { "npm-asset-bugs": {
@ -1244,6 +1272,18 @@
"npm-asset/jquery-mousewheel": ">=3.1.13", "npm-asset/jquery-mousewheel": ">=3.1.13",
"npm-asset/php-date-formatter": ">=1.3.4,<2.0.0" "npm-asset/php-date-formatter": ">=1.3.4,<2.0.0"
}, },
"require-dev": {
"npm-asset/chai": ">=4.1.2,<5.0.0",
"npm-asset/concat": "dev-github:azer/concat",
"npm-asset/concat-cli": ">=4.0.0,<5.0.0",
"npm-asset/karma": ">=2.0.0,<3.0.0",
"npm-asset/karma-chai": ">=0.1.0,<0.2.0",
"npm-asset/karma-firefox-launcher": ">=1.1.0,<2.0.0",
"npm-asset/karma-mocha": ">=1.3.0,<2.0.0",
"npm-asset/mocha": ">=5.0.4,<6.0.0",
"npm-asset/uglifycss": ">=0.0.27,<0.0.28",
"npm-asset/uglifyjs": ">=2.4.10,<3.0.0"
},
"type": "npm-asset-library", "type": "npm-asset-library",
"extra": { "extra": {
"npm-asset-bugs": { "npm-asset-bugs": {
@ -1297,12 +1337,6 @@
"reference": null, "reference": null,
"shasum": "06f0335f16e353a695e7206bf50503cb523a6ee5" "shasum": "06f0335f16e353a695e7206bf50503cb523a6ee5"
}, },
"require-dev": {
"npm-asset/grunt": "~0.4.1",
"npm-asset/grunt-contrib-connect": "~0.5.0",
"npm-asset/grunt-contrib-jshint": "~0.7.1",
"npm-asset/grunt-contrib-uglify": "~0.2.7"
},
"type": "npm-asset-library", "type": "npm-asset-library",
"extra": { "extra": {
"npm-asset-bugs": { "npm-asset-bugs": {
@ -1854,6 +1888,53 @@
], ],
"time": "2016-08-06T14:39:51+00:00" "time": "2016-08-06T14:39:51+00:00"
}, },
{
"name": "psr/log",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/php-fig/log.git",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-fig/log/zipball/6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"reference": "6c001f1daafa3a3ac1d8ff69ee4db8e799a654dd",
"shasum": ""
},
"require": {
"php": ">=5.3.0"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
}
},
"autoload": {
"psr-4": {
"Psr\\Log\\": "Psr/Log/"
}
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "PHP-FIG",
"homepage": "http://www.php-fig.org/"
}
],
"description": "Common interface for logging libraries",
"homepage": "https://github.com/php-fig/log",
"keywords": [
"log",
"psr",
"psr-3"
],
"time": "2018-11-20T15:27:04+00:00"
},
{ {
"name": "seld/cli-prompt", "name": "seld/cli-prompt",
"version": "1.0.3", "version": "1.0.3",

71
include/api.php
View file

@ -181,7 +181,7 @@ function api_login(App $a)
var_dump($consumer, $token); var_dump($consumer, $token);
die(); die();
} catch (Exception $e) { } catch (Exception $e) {
Logger::log($e); $a->getLogger()->warning('API login: error', ['module' => 'api', 'action' => 'login', 'exception' => $e->getMessage()]);
} }
// workaround for HTTP-auth in CGI mode // workaround for HTTP-auth in CGI mode
@ -195,7 +195,7 @@ function api_login(App $a)
} }
if (empty($_SERVER['PHP_AUTH_USER'])) { if (empty($_SERVER['PHP_AUTH_USER'])) {
Logger::log('API_login: ' . print_r($_SERVER, true), Logger::DEBUG); $a->getLogger()->debug('API login: failed', ['module' => 'api', 'action' => 'login', 'parameters' => $_SERVER]);
header('WWW-Authenticate: Basic realm="Friendica"'); header('WWW-Authenticate: Basic realm="Friendica"');
throw new UnauthorizedException("This API requires login"); throw new UnauthorizedException("This API requires login");
} }
@ -236,7 +236,7 @@ function api_login(App $a)
} }
if (!DBA::isResult($record)) { if (!DBA::isResult($record)) {
Logger::log('API_login failure: ' . print_r($_SERVER, true), Logger::DEBUG); $a->getLogger()->debug('API login: failed', ['module' => 'api', 'action' => 'login', 'parameters' => $_SERVER]);
header('WWW-Authenticate: Basic realm="Friendica"'); header('WWW-Authenticate: Basic realm="Friendica"');
//header('HTTP/1.0 401 Unauthorized'); //header('HTTP/1.0 401 Unauthorized');
//die('This api requires login'); //die('This api requires login');
@ -309,33 +309,35 @@ function api_call(App $a)
api_login($a); api_login($a);
} }
Logger::log('API call for ' . $a->user['username'] . ': ' . $a->query_string); $a->getLogger()->info('API call', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username']]);
Logger::log('API parameters: ' . print_r($_REQUEST, true)); $a->getLogger()->debug('API parameters', ['module' => 'api', 'action' => 'call', 'parameters' => $_REQUEST]);
$stamp = microtime(true); $stamp = microtime(true);
$return = call_user_func($info['func'], $type); $return = call_user_func($info['func'], $type);
$duration = (float) (microtime(true) - $stamp); $duration = (float) (microtime(true) - $stamp);
Logger::log("API call duration: " . round($duration, 2) . "\t" . $a->query_string, Logger::DEBUG);
$a->getLogger()->info('API call', ['module' => 'api', 'action' => 'call', 'username' => $a->user['username'], 'duration' => round($duration, 2)]);
if (Config::get("system", "profiler")) { if (Config::get("system", "profiler")) {
$duration = microtime(true)-$a->performance["start"]; $duration = microtime(true)-$a->performance["start"];
/// @TODO round() really everywhere? /// @TODO round() really everywhere?
Logger::log( $a->getLogger()->debug(
parse_url($a->query_string, PHP_URL_PATH) . ": " . sprintf( 'API call performance',
"Database: %s/%s, Cache %s/%s, Network: %s, I/O: %s, Other: %s, Total: %s", [
round($a->performance["database"] - $a->performance["database_write"], 3), 'module' => 'api',
round($a->performance["database_write"], 3), 'action' => 'performance',
round($a->performance["cache"], 3), 'database_read' => round($a->performance["database"] - $a->performance["database_write"], 3),
round($a->performance["cache_write"], 3), 'database_write' => round($a->performance["database_write"], 3),
round($a->performance["network"], 2), 'cache_read' => round($a->performance["cache"], 3),
round($a->performance["file"], 2), 'cache_write' => round($a->performance["cache_write"], 3),
round($duration - ($a->performance["database"] 'network_io' => round($a->performance["network"], 2),
'file_io' => round($a->performance["file"], 2),
'other_io' => round($duration - ($a->performance["database"]
+ $a->performance["cache"] + $a->performance["cache_write"] + $a->performance["cache"] + $a->performance["cache_write"]
+ $a->performance["network"] + $a->performance["file"]), 2), + $a->performance["network"] + $a->performance["file"]), 2),
round($duration, 2) 'total' => round($duration, 2)
), ]
Logger::DEBUG
); );
if (Config::get("rendertime", "callstack")) { if (Config::get("rendertime", "callstack")) {
@ -376,7 +378,7 @@ function api_call(App $a)
$o .= $func . ": " . $time . "\n"; $o .= $func . ": " . $time . "\n";
} }
} }
Logger::log($o, Logger::DEBUG); $a->getLogger()->debug($o, ['module' => 'api', 'action' => 'performance']);
} }
} }
@ -413,7 +415,7 @@ function api_call(App $a)
} }
} }
Logger::log('API call not implemented: ' . $a->query_string); $a->getLogger()->warning('API call not implemented');
throw new NotImplementedException(); throw new NotImplementedException();
} catch (HTTPException $e) { } catch (HTTPException $e) {
header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}"); header("HTTP/1.1 {$e->httpcode} {$e->httpdesc}");
@ -522,7 +524,7 @@ function api_get_user(App $a, $contact_id = null)
$extra_query = ""; $extra_query = "";
$url = ""; $url = "";
Logger::log("api_get_user: Fetching user data for user ".$contact_id, Logger::DEBUG); $a->getLogger()->info('api_get_user: Fetching user data', ['module' => 'api', 'action' => 'get_user', 'user' => $contact_id]);
// Searching for contact URL // Searching for contact URL
if (!is_null($contact_id) && (intval($contact_id) == 0)) { if (!is_null($contact_id) && (intval($contact_id) == 0)) {
@ -606,7 +608,7 @@ function api_get_user(App $a, $contact_id = null)
} }
} }
Logger::log("api_get_user: user ".$user, Logger::DEBUG); $a->getLogger()->info('api_get_user: getting user', ['module' => 'api', 'action' => 'get_user', 'user' => $user]);
if (!$user) { if (!$user) {
if (api_user() === false) { if (api_user() === false) {
@ -618,7 +620,7 @@ function api_get_user(App $a, $contact_id = null)
} }
} }
Logger::log('api_user: ' . $extra_query . ', user: ' . $user); $a->getLogger()->info('api_get_user: found user', ['module' => 'api', 'action' => 'get_user', 'user' => $user, 'extra_query' => $extra_query]);
// user info // user info
$uinfo = q( $uinfo = q(
@ -1937,7 +1939,7 @@ function api_conversation_show($type)
$id = intval(defaults($a->argv, 4, 0)); $id = intval(defaults($a->argv, 4, 0));
} }
Logger::log('API: api_conversation_show: '.$id); $a->getLogger()->info('API: api_conversation_show', ['module' => 'api', 'action' => 'conversation', 'id' => $id]);
// try to fetch the item for the local user - or the public item, if there is no local one // try to fetch the item for the local user - or the public item, if there is no local one
$item = Item::selectFirst(['parent-uri'], ['id' => $id]); $item = Item::selectFirst(['parent-uri'], ['id' => $id]);
@ -2331,7 +2333,7 @@ function api_favorites($type)
// in friendica starred item are private // in friendica starred item are private
// return favorites only for self // return favorites only for self
Logger::log('api_favorites: self:' . $user_info['self']); $a->getLogger()->info('API: api_favorites', ['module' => 'api', 'action' => 'favorites', 'self' => $user_info['self']]);
if ($user_info['self'] == 0) { if ($user_info['self'] == 0) {
$ret = []; $ret = [];
@ -3686,6 +3688,7 @@ api_register_func('api/direct_messages/destroy', 'api_direct_messages_destroy',
function api_friendships_destroy($type) function api_friendships_destroy($type)
{ {
$uid = api_user(); $uid = api_user();
$a = get_app();
if ($uid === false) { if ($uid === false) {
throw new ForbiddenException(); throw new ForbiddenException();
@ -3694,7 +3697,7 @@ function api_friendships_destroy($type)
$contact_id = defaults($_REQUEST, 'user_id'); $contact_id = defaults($_REQUEST, 'user_id');
if (empty($contact_id)) { if (empty($contact_id)) {
Logger::log("No user_id specified", Logger::DEBUG); $a->getLogger()->notice('No user_id specified', ['module' => 'api', 'action' => 'friendships_destroy']);
throw new BadRequestException("no user_id specified"); throw new BadRequestException("no user_id specified");
} }
@ -3702,7 +3705,7 @@ function api_friendships_destroy($type)
$contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => 0, 'self' => false]); $contact = DBA::selectFirst('contact', ['url'], ['id' => $contact_id, 'uid' => 0, 'self' => false]);
if(!DBA::isResult($contact)) { if(!DBA::isResult($contact)) {
Logger::log("No contact found for ID" . $contact_id, Logger::DEBUG); $a->getLogger()->notice('No contact found for ID', ['module' => 'api', 'action' => 'friendships_destroy', 'contact' => $contact_id]);
throw new NotFoundException("no contact found to given ID"); throw new NotFoundException("no contact found to given ID");
} }
@ -3714,12 +3717,12 @@ function api_friendships_destroy($type)
$contact = DBA::selectFirst('contact', [], $condition); $contact = DBA::selectFirst('contact', [], $condition);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
Logger::log("Not following Contact", Logger::DEBUG); $a->getLogger()->notice('Not following contact', ['module' => 'api', 'action' => 'friendships_destroy']);
throw new NotFoundException("Not following Contact"); throw new NotFoundException("Not following Contact");
} }
if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) { if (!in_array($contact['network'], Protocol::NATIVE_SUPPORT)) {
Logger::log("Not supported", Logger::DEBUG); $a->getLogger()->notice('Not supported', ['module' => 'api', 'action' => 'friendships_destroy', 'network' => $contact['network']]);
throw new ExpectationFailedException("Not supported"); throw new ExpectationFailedException("Not supported");
} }
@ -3730,7 +3733,7 @@ function api_friendships_destroy($type)
Contact::terminateFriendship($owner, $contact, $dissolve); Contact::terminateFriendship($owner, $contact, $dissolve);
} }
else { else {
Logger::log("No owner found", Logger::DEBUG); $a->getLogger()->notice('No owner found', ['module' => 'api', 'action' => 'friendships_destroy', 'uid' => $uid]);
throw new NotFoundException("Error Processing Request"); throw new NotFoundException("Error Processing Request");
} }
@ -4837,7 +4840,8 @@ function api_friendica_remoteauth()
'sec' => $sec, 'expire' => time() + 45]; 'sec' => $sec, 'expire' => time() + 45];
DBA::insert('profile_check', $fields); DBA::insert('profile_check', $fields);
Logger::log($contact['name'] . ' ' . $sec, Logger::DEBUG); $a = get_app();
$a->getLogger()->info('API: friendica_remoteauth', ['module' => 'api', 'action' => 'remoteauth', 'contact' => $contact['name'], 'hey' => $sec]);
$dest = ($url ? '&destination_url=' . $url : ''); $dest = ($url ? '&destination_url=' . $url : '');
System::externalRedirect( System::externalRedirect(
@ -5086,7 +5090,8 @@ function api_in_reply_to($item)
// https://github.com/friendica/friendica/issues/1010 // https://github.com/friendica/friendica/issues/1010
// This is a bugfix for that. // This is a bugfix for that.
if (intval($in_reply_to['status_id']) == intval($item['id'])) { if (intval($in_reply_to['status_id']) == intval($item['id'])) {
Logger::log('this message should never appear: id: '.$item['id'].' similar to reply-to: '.$in_reply_to['status_id'], Logger::DEBUG); $a = get_app();
$a->getLogger()->warning('ID is similar to reply-to', ['module' => 'api', 'action' => 'in_reply_to', 'id' => $item['id'], 'reply-to' => $in_reply_to['status_id']]);
$in_reply_to['status_id'] = null; $in_reply_to['status_id'] = null;
$in_reply_to['user_id'] = null; $in_reply_to['user_id'] = null;
$in_reply_to['status_id_str'] = null; $in_reply_to['status_id_str'] = null;

8
index.php
View file

@ -4,15 +4,19 @@
* Friendica * Friendica
*/ */
use Friendica\App;
use Friendica\Core\Logger;
if (!file_exists(__DIR__ . '/vendor/autoload.php')) { if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.'); die('Vendor path not found. Please execute "bin/composer.phar --no-dev install" on the command line in the web root.');
} }
require __DIR__ . '/vendor/autoload.php'; require __DIR__ . '/vendor/autoload.php';
$logger = Logger::create('app');
// We assume that the index.php is called by a frontend process // We assume that the index.php is called by a frontend process
// The value is set to "true" by default in App // The value is set to "true" by default in App
$a = new Friendica\App(__DIR__, false); $a = new App(__DIR__, $logger, false);
$a->runFrontend(); $a->runFrontend();

2
mod/acl.php
View file

@ -34,7 +34,7 @@ function acl_content(App $a)
$search = $_REQUEST['query']; $search = $_REQUEST['query'];
} }
Logger::log("Searching for ".$search." - type ".$type." conversation ".$conv_id, Logger::DEBUG); $a->getLogger()->info("Searching for " . $search . " - type " . $type . " conversation " . $conv_id);
if ($search != '') { if ($search != '') {
$sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'"; $sql_extra = "AND `name` LIKE '%%" . DBA::escape($search) . "%%'";

29
src/App.php
View file

@ -8,8 +8,10 @@ use Detection\MobileDetect;
use DOMDocument; use DOMDocument;
use DOMXPath; use DOMXPath;
use Exception; use Exception;
use Friendica\Core\Logger;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Network\HTTPException\InternalServerErrorException; use Friendica\Network\HTTPException\InternalServerErrorException;
use Monolog;
/** /**
* *
@ -106,6 +108,11 @@ class App
*/ */
public $mobileDetect; public $mobileDetect;
/**
* @var Monolog\Logger The current logger of this App
*/
private $logger;
/** /**
* Register a stylesheet file path to be included in the <head> tag of every page. * Register a stylesheet file path to be included in the <head> tag of every page.
* Inclusion is done in App->initHead(). * Inclusion is done in App->initHead().
@ -147,12 +154,15 @@ class App
* @brief App constructor. * @brief App constructor.
* *
* @param string $basePath Path to the app base folder * @param string $basePath Path to the app base folder
* @param Monolog\Logger Logger of this application
* @param bool $isBackend Whether it is used for backend or frontend (Default true=backend) * @param bool $isBackend Whether it is used for backend or frontend (Default true=backend)
* *
* @throws Exception if the Basepath is not usable * @throws Exception if the Basepath is not usable
*/ */
public function __construct($basePath, $isBackend = true) public function __construct($basePath, $logger, $isBackend = true)
{ {
$this->logger = $logger;
if (!static::isDirectoryUsable($basePath, false)) { if (!static::isDirectoryUsable($basePath, false)) {
throw new Exception('Basepath ' . $basePath . ' isn\'t usable.'); throw new Exception('Basepath ' . $basePath . ' isn\'t usable.');
} }
@ -301,6 +311,21 @@ class App
return $this->mode; return $this->mode;
} }
/**
* Returns the Logger of the Application
*
* @return Monolog\Logger The Logger
* @throws InternalServerErrorException when the logger isn't created
*/
public function getLogger()
{
if (empty($this->logger)) {
throw new InternalServerErrorException('Logger of the Application is not defined');
}
return $this->logger;
}
/** /**
* Reloads the whole app instance * Reloads the whole app instance
*/ */
@ -328,6 +353,8 @@ class App
Core\L10n::init(); Core\L10n::init();
$this->process_id = Core\System::processID('log'); $this->process_id = Core\System::processID('log');
Logger::loadDefaultHandler($this->logger, $this);
} }
/** /**

48
src/App/FriendicaLoggerProcessor.php Normal file
View file

@ -0,0 +1,48 @@
<?php
namespace Friendica\App;
use Monolog\Processor\ProcessorInterface;
/**
* Includes the Friendica specific process_id of "app->process_id"
*
* @package Friendica\App
*/
class FriendicaLoggerProcessor implements ProcessorInterface
{
/**
* @var string the ID of the current Friendica process
*/
private $processId = null;
/**
* Set the process id based on the Application instance
*
* @param string $processId the process id
*/
public function setProcessId($processId)
{
if (!isset($this->processId) || $this->processId == '')
{
$this->processId = $processId;
}
}
public function __construct()
{
$this->processId = session_id();
}
public function __invoke(array $records)
{
$records['extra'] = array_merge(
$records['extra'],
[
'app_id' => $this->processId,
]
);
return $records;
}
}

7
src/BaseObject.php
View file

@ -4,6 +4,10 @@
*/ */
namespace Friendica; namespace Friendica;
require_once 'boot.php';
use Friendica\Core\Logger;
/** /**
* Basic object * Basic object
* *
@ -23,7 +27,8 @@ class BaseObject
public static function getApp() public static function getApp()
{ {
if (empty(self::$app)) { if (empty(self::$app)) {
self::$app = new App(dirname(__DIR__)); $logger = Logger::create('app');
self::$app = new App(dirname(__DIR__), $logger);
} }
return self::$app; return self::$app;

69
src/Core/Logger.php
View file

@ -4,23 +4,72 @@
*/ */
namespace Friendica\Core; namespace Friendica\Core;
use Friendica\App;
use Friendica\BaseObject; use Friendica\BaseObject;
use Friendica\Core\Config; use Monolog;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use ReflectionClass;
/** /**
* @brief Logger functions * @brief Logger functions
*/ */
class Logger extends BaseObject class Logger extends BaseObject
{ {
/**
* Creates a basic Monolog instance for logging.
*
* @param string $application the current application name (index, daemon, ...)
*
* @return Monolog\Logger The Logger instance
*/
public static function create($application)
{
$logger = new Monolog\Logger($application);
$logger->pushProcessor(new Monolog\Processor\IntrospectionProcessor());
$logger->pushProcessor(new Monolog\Processor\ProcessIdProcessor());
$logger->pushProcessor(new Monolog\Processor\WebProcessor());
$logger->pushProcessor(new App\FriendicaLoggerProcessor());
return $logger;
}
/**
* Sets the default Logging handler for this instance.
* Can be combined with other handlers too if necessary.
*
* @param Monolog\Logger $logger The Logger instance of this Application
* @param App $app The Friendica Application
*/
public static function loadDefaultHandler($logger, $app)
{
foreach ($logger->getProcessors() as $processor) {
if ($processor instanceof App\FriendicaLoggerProcessor) {
$processor->setProcessId($app->process_id);
}
}
$debugging = Config::get('system', 'debugging');
$logfile = Config::get('system', 'logfile');
$loglevel = intval(Config::get('system', 'loglevel'));
if (!$debugging || !$logfile) {
return;
}
$fileHandler = new Monolog\Handler\StreamHandler($logfile . ".1", $loglevel);
$logger->pushHandler($fileHandler);
}
// Log levels: // Log levels:
const WARNING = 0; //EMERGENCY
const INFO = 1; //ALERT
const TRACE = 2; //CRITICAL
const DEBUG = 3; const WARNING = 0; //ERROR
const DATA = 4; const INFO = 1; //WARNING
const ALL = 5; const TRACE = 2; //NOTICE(default)
const DEBUG = 3; //INFO
const DATA = 4; //INFO
const ALL = 5; //DEBUG
public static $levels = [ public static $levels = [
self::WARNING => 'Warning', self::WARNING => 'Warning',
@ -36,6 +85,8 @@ class Logger extends BaseObject
* *
* @param string $msg * @param string $msg
* @param int $level * @param int $level
*
* @deprecated since 2019.03 - use App->getLogger() instead
*/ */
public static function log($msg, $level = self::INFO) public static function log($msg, $level = self::INFO)
{ {
@ -90,6 +141,8 @@ class Logger extends BaseObject
* personally without background noise * personally without background noise
* *
* @param string $msg * @param string $msg
*
* * @deprecated since 2019.03 - never used
*/ */
public static function devLog($msg) public static function devLog($msg)
{ {

4
tests/src/BaseObjectTest.php
View file

@ -7,6 +7,7 @@ namespace Friendica\Test;
use Friendica\App; use Friendica\App;
use Friendica\BaseObject; use Friendica\BaseObject;
use Monolog\Logger;
use PHPUnit\Framework\TestCase; use PHPUnit\Framework\TestCase;
/** /**
@ -38,7 +39,8 @@ class BaseObjectTest extends TestCase
*/ */
public function testSetApp() public function testSetApp()
{ {
$app = new App(__DIR__ . '/../../'); $logger = Logger::create('test', 'baseobject');
$app = new App(__DIR__ . '/../../', $logger);
$this->assertNull($this->baseObject->setApp($app)); $this->assertNull($this->baseObject->setApp($app));
$this->assertEquals($app, $this->baseObject->getApp()); $this->assertEquals($app, $this->baseObject->getApp());
} }

12
update.php
View file

@ -1,9 +1,9 @@
<?php <?php
use Friendica\Core\Addon; use Friendica\Core\Addon;
use Friendica\BaseObject;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\Logger;
use Friendica\Core\PConfig; use Friendica\Core\PConfig;
use Friendica\Core\Update; use Friendica\Core\Update;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -332,8 +332,10 @@ function update_1298()
$fail++; $fail++;
} else { } else {
DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]); DBA::update('profile', [$translateKey => $key], ['id' => $data['id']]);
logger::log('Updated contact ' . $data['id'] . " to $translateKey " . $key . BaseObject::getApp()
' (was: ' . $data[$translateKey] . ')'); ->getLogger()
->notice('Updated contact', ['action' => 'update', 'contact' => $data['id'], "$translateKey" => $key,
'was' => $data[$translateKey]]);
Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']); Worker::add(PRIORITY_LOW, 'ProfileUpdate', $data['id']);
Contact::updateSelfFromUserID($data['id']); Contact::updateSelfFromUserID($data['id']);
GContact::updateForUser($data['id']); GContact::updateForUser($data['id']);
@ -342,7 +344,9 @@ function update_1298()
} }
} }
Logger::log($translateKey . " fix completed. Success: $success. Fail: $fail"); BaseObject::getApp()
->getLogger()
->notice($translateKey . " fix completed", ['action' => 'update', 'translateKey' => $translateKey, 'Success' => $success, 'Fail' => $fail ]);
} }
return Update::SUCCESS; return Update::SUCCESS;
} }