Using microtime properly for all Log-specific dates. Added new tool-m…

…ethod called NotNowButRightNow. added parent path to request hash for clarity
enobrev · Sep 7, 2016 · 46d3b52 · 46d3b52
1 parent 5d19ad2
commit 46d3b52
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 7 deletions.
diff --git a/composer.json b/composer.json
@@ -25,6 +25,7 @@
         "files": [
             "src/ErrorsToExceptions.php",
             "src/Arrays.php",
+            "src/DateTime.php",
             "src/Debugging.php",
             "src/Headers.php",
             "src/Strings.php"

diff --git a/composer.lock b/composer.lock
diff --git a/src/DateTime.php b/src/DateTime.php
@@ -0,0 +1,13 @@
+<?php
+    namespace Enobrev;
+
+    use DateTime;
+
+    /**
+     * Returns DateTime object with proper microtime
+     * @return DateTime
+     */
+    function notNowByRightNow() {
+        $aMicroTime = explode(' ', microtime());
+        return new DateTime(date('Y-m-d H:i:s.' . $aMicroTime[0] * 1000000, $aMicroTime[1]));
+    }
diff --git a/src/Log.php b/src/Log.php
@@ -216,7 +216,7 @@ private static function getThreadHash() {
             } else if (isset($_REQUEST['__t'])) {
                 self::$sThreadHash = $_REQUEST['__t'];
             } else {
-                self::$sThreadHash = substr(hash('sha1', (new DateTime())->format('Y-m-d G:i:s u')), 0, 6);
+                self::$sThreadHash = substr(hash('sha1', notNowByRightNow()->format('Y-m-d G:i:s.u')), 0, 6);
             }
 
             return self::$sThreadHash;
@@ -232,6 +232,13 @@ private static function getParentHash() {
             }
         }
 
+        /**
+         * @return string
+         */
+        private static function getParentPath() {
+            return implode('.', self::$aHashHistory);
+        }
+
         /**
          * @internal param bool $bForceReset
          * @return string
@@ -241,10 +248,8 @@ private static function getRequestHash() {
                 $sIP    = get_ip();
                 $sAgent = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
 
-                $aMicroTime = explode(' ', microtime());
-                $oNow       = new DateTime(date('Y-m-d H:i:s.' . $aMicroTime[0] * 1000000, $aMicroTime[1]));
                 $aRequest   = array(
-                    'date' => $oNow->format('Y-m-d H:i:s.u')
+                    'date' => notNowByRightNow()->format('Y-m-d H:i:s.u')
                 );
 
                 if (isset($_SERVER['HTTP_REFERER']))    { $aRequest['referrer']   = $_SERVER['HTTP_REFERER'];     }
@@ -253,7 +258,7 @@ private static function getRequestHash() {
                 if (strlen($sAgent))                    { $aRequest['agent']      = $sAgent;                      }
                 if ($sIP != 'unknown')                  { $aRequest['ip']         = $sIP;                         }
 
-                self::$sRequestHash = substr(hash('sha1', json_encode($aRequest)), 0, 8);
+                self::$sRequestHash = self::getParentPath() . '.' . substr(hash('sha1', json_encode($aRequest)), 0, 6);
 
                 $aMessage = array(
                     'action'    => 'Log.Start',