automatically prepend filename to debug output
darcs-hash:20080605024035-84dde-bc3abc4329f3181cffd26e83d37968ee6a02a26e.gz
This commit is contained in:
parent
593f1e5e2c
commit
d241352dcc
|
@ -326,13 +326,21 @@ class UserauthorizationAction extends Action {
|
|||
function validate_request(&$req) {
|
||||
# OAuth stuff -- have to copy from OAuth.php since they're
|
||||
# all private methods, and there's no user-authentication method
|
||||
common_debug('checking version', __FILE__);
|
||||
$this->check_version($req);
|
||||
common_debug('getting datastore', __FILE__);
|
||||
$datastore = omb_oauth_datastore();
|
||||
common_debug('getting consumer', __FILE__);
|
||||
$consumer = $this->get_consumer($datastore, $req);
|
||||
common_debug('getting token', __FILE__);
|
||||
$token = $this->get_token($datastore, $req, $consumer);
|
||||
common_debug('checking timestamp', __FILE__);
|
||||
$this->check_timestamp($req);
|
||||
common_debug('checking nonce', __FILE__);
|
||||
$this->check_nonce($datastore, $req, $consumer, $token);
|
||||
common_debug('checking signature', __FILE__);
|
||||
$this->check_signature($req, $consumer, $token);
|
||||
common_debug('checking signature', __FILE__);
|
||||
$this->validate_omb($req);
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -35,6 +35,7 @@ require_once('DB/DataObject/Cast.php'); # for dates
|
|||
$config =
|
||||
array('site' =>
|
||||
array('name' => 'Just another Laconica microblog',
|
||||
'appname' => 'laconica', # for syslog
|
||||
'server' => 'localhost',
|
||||
'path' => '/',
|
||||
'fancy' => false),
|
||||
|
|
13
lib/util.php
13
lib/util.php
|
@ -575,19 +575,22 @@ function _t($str) {
|
|||
function common_ensure_syslog() {
|
||||
static $initialized = false;
|
||||
if (!$initialized) {
|
||||
global $config;
|
||||
define_syslog_variables();
|
||||
openlog("laconica", 0, LOG_USER);
|
||||
openlog($config['site']['appname'], 0, LOG_USER);
|
||||
$initialized = true;
|
||||
}
|
||||
}
|
||||
|
||||
function common_log($priority, $msg) {
|
||||
function common_log($priority, $msg, $filename=NULL) {
|
||||
common_ensure_syslog();
|
||||
syslog($priority, $msg);
|
||||
if ($filename) {
|
||||
syslog($priority, basename($filename).' - '.$msg);
|
||||
}
|
||||
}
|
||||
|
||||
function common_debug($msg) {
|
||||
common_log(LOG_DEBUG, $msg);
|
||||
function common_debug($msg, $filename=NULL) {
|
||||
common_log(LOG_DEBUG, $msg, $filename);
|
||||
}
|
||||
|
||||
function common_valid_http_url($url) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user