清理一些无效的代码

Author: aisuhua

app/config/config.php

@@ -7,7 +7,7 @@
         'host' => '192.168.1.229',
         'username' => 'root',
         'password' => 'lala123',
-        'dbname' => 'supervisor',
+        'dbname' => 'supervisor-dashboard',
         'charset' => 'utf8mb4',
     ],
     'application' => [

app/controller/ControllerSupervisorBase.php

@@ -52,49 +52,6 @@ public function initialize()
         }
     }
 
-    /**
-     * @link https://stackoverflow.com/questions/16941456/adding-a-php-anonymous-function-to-an-object
-     * @param $callback
-     */
-    protected function setCallback($callback)
-    {
-        $this->callback = $callback;
-    }
-
-    protected function invoke($timeout = 10)
-    {
-        $exception = null;
-        for ($i = 1; $i <= $timeout * 2; $i++)
-        {
-            try
-            {
-                call_user_func($this->callback);
-                $exception = null;
-                break;
-            }
-            catch (Exception $e)
-            {
-                $exception = $e;
-                usleep(500000);
-            }
-        }
-
-        if ($exception)
-        {
-            throw $exception;
-        }
-    }
-
-    protected function redirectToIndex()
-    {
-        return $this->response->redirect(self::getIndexUrl());
-    }
-
-    protected function getIndexUrl()
-    {
-        return "/server/{$this->server->id}/process?ip={$this->server->ip}&port={$this->server->port}";
-    }
-
     protected function formatMessage($message)
     {
         return "<strong>{$message}</strong>\n请刷新页面查看进度";

app/controller/SupervisorController.php

@@ -5,36 +5,17 @@ class SupervisorController extends ControllerSupervisorBase
 {
     public function readLogAction()
     {
-        $callback = function ()
-        {
-            // 只看前面 1M 的日志
-            $log = $log = $this->supervisor->readLog(-1024 * 1024, 0);
-            $this->view->log = $log;
-        };
-        $this->setCallback($callback);
-        $this->invoke();
+        $log = $this->supervisor->readLog(-1024 * 1024, 0);
+        $this->view->log = $log;
 
         $this->view->disableLevel([
             View::LEVEL_LAYOUT => true,
         ]);
-
-        $this->view->setTemplateBefore('readLog');
-
-        if ($this->isPjax())
-        {
-            $this->view->setRenderLevel(View::LEVEL_ACTION_VIEW);
-        }
     }
 
     public function clearLogAction()
     {
-        $result = [];
-        $callback = function()
-        {
-            $this->supervisor->clearLog();
-        };
-        $this->setCallback($callback);
-        $this->invoke();
+        $this->supervisor->clearLog();
 
         $result['state'] = 1;
         $result['message'] = "日志清理完成";
@@ -52,12 +33,11 @@ public function restartAction()
 
         fastcgi_finish_request();
 
-        $callback = function ()
-        {
-            $this->supervisor->restart();
-        };
-        $this->setCallback($callback);
-        $this->invoke();
+        $this->supervisor->restart();
+
+        $this->view->setRenderLevel(
+            View::LEVEL_NO_RENDER
+        );
     }
 }
 

app/view/layouts/readLog.volt

@@ -1,7 +1,6 @@
 {% include 'partials/nav.volt' %}
 
 <div id="pjax-container">
-    11111
     {{ content() }}
 </div>
 

app/view/layouts/supervisor-config.volt

@@ -66,23 +66,9 @@ $(function() {
     var ini_editor = document.getElementById('ini');
 
     if (ini_editor) {
-        // code editor
-        var editor = CodeMirror.fromTextArea(document.getElementById('ini'), {
-            mode: "properties",
-            lineNumbers: true,
-            lineWrapping: true,
-            indentUnit: 0,
-            autoRefresh: true,
-            automaticLayout: true
-        });
-
+        var editor = CodeMirror.fromTextArea(document.getElementById('ini'));
         editor.setSize('100%', '100%');
 
-        editor.on('change',function(cMirror){
-            cMirror.refresh();
-            editor.setSize('100%', '100%');
-        });
-
         $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
             editor.refresh();
         });

app/view/layouts/supervisor.volt

@@ -1 +1,18 @@
-{{ log | escape | default("没有任何日志记录") }}
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container-fluid">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-3" aria-expanded="false">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="">Supervisor 服务日志</a>
+        </div>
+        <div class="collapse navbar-collapse navbar-right">
+
+        </div>
+    </div>
+</nav>
+
+<samp id="log">{{ log | escape | default("没有任何日志记录") }}</samp>