diff --git a/ykval-db.php b/ykval-db.php index c4de5aa..b07034c 100644 --- a/ykval-db.php +++ b/ykval-db.php @@ -65,6 +65,12 @@ class Db $this->myLog=new Log('ykval-db'); } + + function addField($name, $value) + { + $this->myLog->addField($name, $value); + } + /** * function to convert Db timestamps to unixtime(s) * diff --git a/ykval-sync.php b/ykval-sync.php index b03562c..a6a10c4 100644 --- a/ykval-sync.php +++ b/ykval-sync.php @@ -13,7 +13,7 @@ $myLog->addField('ip', $_SERVER['REMOTE_ADDR']); $myLog->log(LOG_INFO, "Request: " . $_SERVER['QUERY_STRING']); $sync = new SyncLib('ykval-sync:synclib'); -$sync->myLog->addField('ip', $_SERVER['REMOTE_ADDR']); +$sync->addField('ip', $_SERVER['REMOTE_ADDR']); if (! $sync->isConnected()) { sendResp(S_BACKEND_ERROR, $apiKey); @@ -74,7 +74,7 @@ $myLog->log(LOG_INFO, $tmp_log); # At this point we should have to otp so let's add it to the logging module # $myLog->addField('otp', $syncParams['otp']); -$sync->myLog->addField('otp', $syncParams['otp']); +$sync->addField('otp', $syncParams['otp']); # # Verify correctness of input parameters diff --git a/ykval-synclib.php b/ykval-synclib.php index d9b6ed1..d80c751 100644 --- a/ykval-synclib.php +++ b/ykval-synclib.php @@ -25,6 +25,11 @@ class SyncLib } + function addField($name, $value) + { + $this->myLog->addField($name, $value); + $this->db->addField($name, $value); + } function isConnected() { return $this->isConnected; diff --git a/ykval-verify.php b/ykval-verify.php index f0c53ff..5e17461 100644 --- a/ykval-verify.php +++ b/ykval-verify.php @@ -22,7 +22,7 @@ $myLog->log(LOG_INFO, "found protocol version " . $protocol_version); /* Initialize the sync library. Strive to use this instead of custom DB requests, custom comparisons etc */ $sync = new SyncLib('ykval-verify:synclib'); -$sync->myLog->addField('ip', $_SERVER['REMOTE_ADDR']); +$sync->addField('ip', $_SERVER['REMOTE_ADDR']); if (! $sync->isConnected()) { sendResp(S_BACKEND_ERROR, $apiKey); @@ -40,7 +40,7 @@ $timestamp = getHttpVal('timestamp', 0); /* We have the OTP now, so let's add it to the logging */ $myLog->addField('otp', $otp); -$sync->myLog->addField('otp', $otp); +$sync->addField('otp', $otp); if ($protocol_version>=2.0) {