GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

automatically prepend filename to debug output

Browse Source 
darcs-hash:20080605024035-84dde-bc3abc4329f3181cffd26e83d37968ee6a02a26e.gz
This commit is contained in:
Evan Prodromou 2008-06-04 22:40:35 -04:00
parent 593f1e5e2c
commit d241352dcc
3 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
actions/userauthorization.php
View File

@ -326,13 +326,21 @@ class UserauthorizationAction extends Action {
function validate_request(&$req) { function validate_request(&$req) {
# OAuth stuff -- have to copy from OAuth.php since they're # OAuth stuff -- have to copy from OAuth.php since they're
# all private methods, and there's no user-authentication method # all private methods, and there's no user-authentication method
common_debug('checking version', __FILE__);
$this->check_version($req); $this->check_version($req);
common_debug('getting datastore', __FILE__);
$datastore = omb_oauth_datastore(); $datastore = omb_oauth_datastore();
common_debug('getting consumer', __FILE__);
$consumer = $this->get_consumer($datastore, $req); $consumer = $this->get_consumer($datastore, $req);
common_debug('getting token', __FILE__);
$token = $this->get_token($datastore, $req, $consumer); $token = $this->get_token($datastore, $req, $consumer);
common_debug('checking timestamp', __FILE__);
$this->check_timestamp($req); $this->check_timestamp($req);
common_debug('checking nonce', __FILE__);
$this->check_nonce($datastore, $req, $consumer, $token); $this->check_nonce($datastore, $req, $consumer, $token);
common_debug('checking signature', __FILE__);
$this->check_signature($req, $consumer, $token); $this->check_signature($req, $consumer, $token);
common_debug('checking signature', __FILE__);
$this->validate_omb($req); $this->validate_omb($req);
return true; return true;
} }

1
lib/common.php
View File

@ -35,6 +35,7 @@ require_once('DB/DataObject/Cast.php'); # for dates
$config = $config =
array('site' => array('site' =>
array('name' => 'Just another Laconica microblog', array('name' => 'Just another Laconica microblog',
'appname' => 'laconica', # for syslog
'server' => 'localhost', 'server' => 'localhost',
'path' => '/', 'path' => '/',
'fancy' => false), 'fancy' => false),

13
lib/util.php
View File

@ -575,19 +575,22 @@ function _t($str) {
function common_ensure_syslog() { function common_ensure_syslog() {
static $initialized = false; static $initialized = false;
if (!$initialized) { if (!$initialized) {
global $config;
define_syslog_variables(); define_syslog_variables();
openlog("laconica", 0, LOG_USER); openlog($config['site']['appname'], 0, LOG_USER);
$initialized = true; $initialized = true;
} }
} }
function common_log($priority, $msg) { function common_log($priority, $msg, $filename=NULL) {
common_ensure_syslog(); common_ensure_syslog();
syslog($priority, $msg); if ($filename) {
syslog($priority, basename($filename).' - '.$msg);
}
} }
function common_debug($msg) { function common_debug($msg, $filename=NULL) {
common_log(LOG_DEBUG, $msg); common_log(LOG_DEBUG, $msg, $filename);
} }
function common_valid_http_url($url) { function common_valid_http_url($url) {