scottk/control-pane
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/control-pane.git synced 2025-11-04 03:47:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Do not init _db_tasks db on start

Browse Source
This commit is contained in:
Momchil Bozhinov
2021-02-24 00:16:07 +02:00
parent 8d7986f80a
commit 2f1e2752b0
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
php/clonos.php
View File

@@ -108,8 +108,6 @@ class ClonOS {
// $this->json_name=$this->realpath_php.'pages' // $this->json_name=$this->realpath_php.'pages'
// $clonos->json_name=$file_path.'a.json.php'; // $clonos->json_name=$file_path.'a.json.php';
$this->_db_tasks=new Db('base','cbsdtaskd');
if(isset($this->_vars['mode'])) $this->mode=$this->_vars['mode']; if(isset($this->_vars['mode'])) $this->mode=$this->_vars['mode'];
if(isset($this->_vars['form_data'])) $this->form=$this->_vars['form_data']; if(isset($this->_vars['form_data'])) $this->form=$this->_vars['form_data'];
@@ -376,7 +374,7 @@ class ClonOS {
$query="SELECT id,cmd,status,jname FROM taskd WHERE status<2 AND jname IN (?)"; $query="SELECT id,cmd,status,jname FROM taskd WHERE status<2 AND jname IN (?)";
$cmd=''; $cmd='';
$txt_status=''; $txt_status='';
$tasks=$this->_db_tasks->select($query, array([$tid])); $tasks=(new Db('base','cbsdtaskd'))->select($query, array([$tid]));
if(!empty($tasks)) foreach($tasks as $task){ if(!empty($tasks)) foreach($tasks as $task){
$rid=preg_replace('/^#/','',$task['jname']); $rid=preg_replace('/^#/','',$task['jname']);
foreach($check_arr as $key=>$val){ foreach($check_arr as $key=>$val){
@@ -406,7 +404,7 @@ class ClonOS {
/* /*
function getTaskStatus($task_id){ function getTaskStatus($task_id){
$status=$this->_db_tasks->selectOne("SELECT status,logfile,errcode $status=(new Db('base','cbsdtaskd'))->selectOne("SELECT status,logfile,errcode
FROM taskd WHERE id=?", array([$task_id]); FROM taskd WHERE id=?", array([$task_id]);
if($status['errcode']>0) $status['errmsg']=file_get_contents($status['logfile']); if($status['errcode']>0) $status['errmsg']=file_get_contents($status['logfile']);
@@ -510,7 +508,7 @@ class ClonOS {
$ids=join(',',$tasks); $ids=join(',',$tasks);
if(empty($ids)) return $obj; if(empty($ids)) return $obj;
$statuses=$this->_db_tasks->select("SELECT id,status,logfile,errcode FROM taskd WHERE id IN (?)", array([$ids])); $statuses=(new Db('base','cbsdtaskd'))->select("SELECT id,status,logfile,errcode FROM taskd WHERE id IN (?)", array([$ids]));
//print_r($statuses); //print_r($statuses);
foreach($obj as $key=>$task){ foreach($obj as $key=>$task){