From 38185be07d587864b7d9d29c7403a748abc66042 Mon Sep 17 00:00:00 2001 From: Fredrik Thulin Date: Fri, 15 Jun 2012 11:59:42 +0200 Subject: [PATCH] Fix errors with our new logging code :( --- ykval-common.php | 10 +++++----- ykval-sync.php | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ykval-common.php b/ykval-common.php index fd10d71..88fe162 100644 --- a/ykval-common.php +++ b/ykval-common.php @@ -116,7 +116,7 @@ function retrieveURLasync ($ident, $urls, $logger, $ans_req=1, $match="^OK", $re $ch = array(); foreach ($urls as $id => $url) { $handle = curl_init(); - $logger->log($ident . " adding URL : " . $url); + $logger->log(LOG_DEBUG, $ident . " adding URL : " . $url); curl_setopt($handle, CURLOPT_URL, $url); curl_setopt($handle, CURLOPT_USERAGENT, "YK-VAL"); curl_setopt($handle, CURLOPT_RETURNTRANSFER, 1); @@ -137,16 +137,16 @@ function retrieveURLasync ($ident, $urls, $logger, $ans_req=1, $match="^OK", $re ; while ($info = curl_multi_info_read($mh)) { - $logger->log($ident . " curl multi info : ", $info); + $logger->log(LOG_DEBUG, $ident . " curl multi info : ", $info); if ($info['result'] == CURLE_OK) { $str = curl_multi_getcontent($info['handle']); - $logger->log($ident . " curl multi content : " . $str); + $logger->log(LOG_DEBUG, $ident . " curl multi content : " . $str); if (preg_match("/".$match."/", $str)) { - $logger->log($ident . " response matches " . $match); + $logger->log(LOG_DEBUG, $ident . " response matches " . $match); $error = curl_error ($info['handle']); $errno = curl_errno ($info['handle']); $cinfo = curl_getinfo ($info['handle']); - $logger->log($ident . " errno/error: " . $errno . "/" . $error, $cinfo); + $logger->log(LOG_DEBUG, $ident . " errno/error: " . $errno . "/" . $error, $cinfo); $ans_count++; if ($returl) $ans_arr[]="url=" . $cinfo['url'] . "\n" . $str; else $ans_arr[]=$str; diff --git a/ykval-sync.php b/ykval-sync.php index c9fe517..20545a7 100644 --- a/ykval-sync.php +++ b/ykval-sync.php @@ -169,7 +169,7 @@ if ($localParams['active'] != 1) { */ $myLog->log(LOG_WARNING, 'Received sync-request for de-activated Yubikey ' . $yk_publicname . ' - check database synchronization!!!'); - sendResp(S_BAD_OTP, $apiKey); + sendResp(S_BAD_OTP, $myLog, $apiKey); exit; }