Closes fusioninventory#2412 - improve the get jobs log process

ddurieux · Apr 16, 2018 · 79eef9e · 79eef9e
1 parent db949a1
commit 79eef9e
Show file tree

Hide file tree

Showing 4 changed files with 490 additions and 412 deletions.
diff --git a/inc/menu.class.php b/inc/menu.class.php
@@ -941,9 +941,6 @@ static function board() {
       // Number of computer inventories in last hour, 6 hours, 24 hours
       $dataInventory = PluginFusioninventoryInventoryComputerStat::getLastHours();
 
-      /*
-       * As of #2412 - temporarily removing this
-       *
       // Deploy
       $restrict_entity = getEntitiesRestrictRequest(" AND", 'glpi_plugin_fusioninventory_taskjobs');
       $query = "SELECT `plugin_fusioninventory_tasks_id`
@@ -957,7 +954,9 @@ static function board() {
          $a_tasks[] = $data['plugin_fusioninventory_tasks_id'];
       }
       $pfTask = new PluginFusioninventoryTask();
-      $data = $pfTask->getJoblogs($a_tasks);
+      // Do not get logs with the jobs states, this to avoid long request time
+      // and this is not useful on the plugin home page
+      $data = $pfTask->getJoblogs($a_tasks, $with_logs=false);
 
       $dataDeploy = array();
       $dataDeploy[0] = array(
@@ -993,18 +992,13 @@ static function board() {
       for ($k=0; $k<4; $k++) {
          $dataDeploy[$k]['key'] .= " : ".$dataDeploy[$k]['y'];
       }
-       */
 
 
       echo "<div class='fi_board'>";
       self::showChart('computers', $dataComputer);
       self::showChartBar('nbinventory', $dataInventory,
                          __('Number of computer inventories of last hours', 'fusioninventory'));
-      /*
-       * As of #2412 - temporarily removing this
-       *
       self::showChart('deploy', $dataDeploy, __('Deployment', 'fusioninventory'));
-      */
       self::showChart('snmp', $dataSNMP);
       self::showChart('ports', $dataPortL);
       self::showChart('portsconnected', $dataPortC);