Parcourir la source

Add new disk and page adjustments

dong il y a 1 an
Parent
commit
458a305324
3 fichiers modifiés avec 19 ajouts et 16 suppressions
  1. 1 1
      admin/control/arw_monitor.php
  2. 18 14
      admin/templates/default/arw.monitor.php
  3. 0 1
      util/arw_monitor.sh

+ 1 - 1
admin/control/arw_monitor.php

@@ -14,7 +14,7 @@ class arw_monitorControl extends SystemControl
             $val = explode('-', $stime);
             $val = "$val[0]-$val[1]-$val[2] $val[3]:$val[4]:$val[5]";
             $time = strtotime($val);
-            return date("Y-m-d H:i:s", $time);
+            return date("H:i:s", $time);
         };
 
         $calc_bytes = function ($space)

+ 18 - 14
admin/templates/default/arw.monitor.php

@@ -43,44 +43,48 @@
             <th class="align-center width-ten">类型</th>
             <th class="align-center width-ten">更新时间</th>
             <th class="align-center width-fifteen">/mnt</th>
-            <th class="align-center ">/data</th>
+            <th class="align-center width-ten">/data</th>
             <th class="align-center width-ten">shoplog</th>
             <th class="align-center width-ten">yllog</th>
             <th class="align-center width-ten">stdata</th>
-            <th class="align-center width-ten">/mnt/mysql</th>
-            <th class="align-center width-ten">/data/mysqlundo</th>
+            <th class="align-center width-ten">/mysql</th>
+            <th class="align-center width-ten">/mysqlundo</th>
+            <th class="align-center width-ten">/mysqlbinlog</th>
         </thead>
         <tbody id="tbody">
         <?php if (count($output['data']) > 0) { ?>
             <?php
             foreach ($output['data'] as $key => $value) { ?>
                 <tr class="hover trFlex">
-                    <td class="align-left"><span style=" font-size: 16px"><?php echo $key; ?></span></td>
-                    <td class="align-center"><span style=" font-size: 16px"><?php echo $value['server_name']; ?></span></td>
-                    <td class="align-right">
-                        <span style=" font-size: 16px"><?php echo $value['cur_time'] ?? ''; ?></span>
+                    <td class="align-left"><span><?php echo $key; ?></span></td>
+                    <td class="align-center"><span><?php echo $value['server_name']; ?></span></td>
+                    <td class="align-center">
+                        <span><?php echo $value['cur_time'] ?? ''; ?></span>
                     </td>
                     <td class="align-center">
-                        <span style="font-size: 16px"><?php echo $value['/dev/vdb1'] ?? ''; ?></span>
+                        <span><?php echo $value['/dev/vdb1'] ?? ''; ?></span>
                     </td>
                     <td class="align-center">
-                        <span style=" font-size: 16px"><?php echo $value['/dev/vdc1'] ?? ''; ?></span>
+                        <span><?php echo $value['/dev/vdc1'] ?? ''; ?></span>
                     </td>
                     <td class="align-center">
-                        <span style=" font-size: 16px"><?php echo $value['/mnt/shoplog'] ?? ''; ?></span>
+                        <span><?php echo $value['/mnt/shoplog'] ?? ''; ?></span>
                     </td>
                     <td class="align-center">
-                        <span style=" font-size: 16px"><?php echo $value['/mnt/yllog'] ?? ''; ?></span>
+                        <span><?php echo $value['/mnt/yllog'] ?? ''; ?></span>
                     </td>
 
                     <td class="align-center">
-                        <span style=" font-size: 16px"><?php echo $value['/mnt/stdata'] ?? ''; ?></span>
+                        <span><?php echo $value['/mnt/stdata'] ?? ''; ?></span>
+                    </td>
+                    <td class="align-center">
+                        <span><?php echo $value['/mnt/mysql'] ?? ''; ?></span>
                     </td>
                     <td class="align-center">
-                        <span style=" font-size: 16px"><?php echo $value['/mnt/mysql'] ?? ''; ?></span>
+                        <span><?php echo $value['/data/mysqlundo'] ?? ''; ?></span>
                     </td>
                     <td class="align-center">
-                        <span style=" font-size: 16px"><?php echo $value['/data/mysqlundo'] ?? ''; ?></span>
+                        <span><?php echo $value['/data/mysqlbinlog'] ?? ''; ?></span>
                     </td>
                 </tr>
             <?php } ?>

+ 0 - 1
util/arw_monitor.sh

@@ -1,5 +1,4 @@
 #!/bin/bash
-
 source /etc/profile
 
 cur_time=$(date "+%Y-%m-%d-%H-%M-%S")