Merge pull request #147 from eleven26/master

Optimize trait usage
hhxsv5 · May 30, 2019 · 72170c4 · 72170c4
2 parents 41c62a6 + 772fbab
commit 72170c4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 21 deletions.
diff --git a/src/LaravelS.php b/src/LaravelS.php
@@ -35,17 +35,8 @@ class LaravelS extends Server
     /**
      * Fix conflicts of traits
      */
-    use InotifyTrait, LaravelTrait, LogTrait, ProcessTitleTrait, TimerTrait, CustomProcessTrait {
-        LogTrait::log insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LogTrait::logException insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LogTrait::trace insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LogTrait::info insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LogTrait::warning insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LogTrait::error insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LogTrait::callWithCatchException insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        ProcessTitleTrait::setProcessTitle insteadof InotifyTrait, TimerTrait, CustomProcessTrait;
-        LaravelTrait::initLaravel insteadof TimerTrait, CustomProcessTrait;
-    }
+    use InotifyTrait, LaravelTrait, LogTrait, ProcessTitleTrait, TimerTrait, CustomProcessTrait;
+
     /**@var array */
     protected $laravelConf;
 

diff --git a/src/Swoole/Traits/CustomProcessTrait.php b/src/Swoole/Traits/CustomProcessTrait.php
@@ -9,9 +9,6 @@
 
 trait CustomProcessTrait
 {
-    use ProcessTitleTrait;
-    use LogTrait;
-
     public function addCustomProcesses(Server $swoole, $processPrefix, array $processes, array $laravelConfig)
     {
         $pidfile = dirname($swoole->setting['pid_file']) . '/laravels-custom-processes.pid';

diff --git a/src/Swoole/Traits/InotifyTrait.php b/src/Swoole/Traits/InotifyTrait.php
@@ -9,9 +9,6 @@
 
 trait InotifyTrait
 {
-    use ProcessTitleTrait;
-    use LogTrait;
-
     public function addInotifyProcess(Server $swoole, array $config, array $laravelConf)
     {
         if (empty($config['enable'])) {

diff --git a/src/Swoole/Traits/TimerTrait.php b/src/Swoole/Traits/TimerTrait.php
@@ -8,10 +8,6 @@
 
 trait TimerTrait
 {
-    use ProcessTitleTrait;
-    use LaravelTrait;
-    use LogTrait;
-
     public function addTimerProcess(Server $swoole, array $config, array $laravelConfig)
     {
         if (empty($config['enable']) || empty($config['jobs'])) {