Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / lib / iomaster.php

diff --git a/lib/iomaster.php b/lib/iomaster.php
index 7cfb2c9a0ff18c59039cfdae634c728ec9fc8282..e53fc6511e1eebce4694d4bc187a1c00fd60d605 100644 (file)
--- a/lib/iomaster.php
+++ b/lib/iomaster.php
@@ -132,7 +132,7 @@ abstract class IoMaster
                 $write = array();
                 $except = array();
                 $this->logState('listening');
-                common_log(LOG_DEBUG, "Waiting up to $timeout seconds for socket data...");
+                //common_debug("Waiting up to $timeout seconds for socket data...");
                 $ready = stream_select($read, $write, $except, $timeout, 0);
 
                 if ($ready === false) {
@@ -152,7 +152,7 @@ abstract class IoMaster
 
             if ($timeout > 0 && empty($sockets)) {
                 // If we had no listeners, sleep until the pollers' next requested wakeup.
-                common_log(LOG_DEBUG, "Sleeping $timeout seconds until next poll cycle...");
+                common_debug("Sleeping $timeout seconds until next poll cycle...");
                 $this->logState('sleep');
                 sleep($timeout);
             }
@@ -190,7 +190,7 @@ abstract class IoMaster
                 }
             } else if (common_config('queue', 'debug_memory')) {
                 $fmt = number_format($usage);
-                common_log(LOG_DEBUG, "Memory usage $fmt");
+                common_debug("Memory usage $fmt");
             }
         }
     }