删除 Throwable 类定义

Author: ueaner

src/Process.php

@@ -115,14 +115,14 @@ protected function setsid()
 
     protected function redirectStd()
     {
+        $logFile = $this->logFile ?: '/dev/null';
+
         // redirect stdin to /dev/null
         // redirect stdout, stderr to $logFile
         fclose(STDIN);
         fclose(STDOUT);
         fclose(STDERR);
 
-        $logFile = $this->logFile ?: '/dev/null';
-
         global $stdin, $stdout, $stderr;
         $stdin = fopen('/dev/null', 'r');
         $stdout = fopen($logFile, 'a');
@@ -172,8 +172,11 @@ protected function run()
             $this->log("[worker:{$this->id} {$this->workerPid}] process started");
             // Run job.
             call_user_func($this->job, $this);
+        } catch (\Exception $e) {
+            $this->log("[worker:{$this->id} {$this->workerPid}] $e");
+            exit(250);
         } catch (\Throwable $e) {
-            $this->log("[worker:{$this->id} {$this->workerPid}] " . $e);
+            $this->log("[worker:{$this->id} {$this->workerPid}] $e");
             exit(250);
         }
     }
@@ -193,7 +196,8 @@ public function handleFatalError()
     public function log($contents)
     {
         $time = gettimeofday();
-        $contents = sprintf("[%s.%s] [master %s] %s\n", date('Y-m-d H:i:s', $time['sec']), $time['usec'], $this->masterPid, $contents);
+        $usec = str_pad($time['usec'], 6, '0');
+        $contents = sprintf("[%s.%s] [master %s] %s\n", date('Y-m-d H:i:s', $time['sec']), $usec, $this->masterPid, $contents);
         if (!$this->daemonize) {
             echo $contents;
         }

src/helpers.php

@@ -3,12 +3,6 @@
  * @author ueaner <[email protected]>
  */
 
-if (!interface_exists('Throwable') && !class_exists('Throwable')) {
-    class Throwable extends Exception
-    {
-    }
-}
-
 if (!function_exists('data_segment')) {
     /**
      * 数据切分