#2183 probably solved - one 'private' to 'public' change and one 'global' statement added.

This commit is contained in:
tomash 2007-02-13 16:50:01 +00:00
parent e5ea53f8ac
commit a105d81743
1 changed files with 10 additions and 4 deletions

View File

@ -44,8 +44,9 @@ class Restore {
/** /**
* @var string * @var string
*/ */
private $loglevel = 'warn'; // private $loglevel = 'warn';
#private $loglevel = 'debug'; public $loglevel = 'warn';
// public $loglevel = 'debug';
/** /**
* @var GreenBox * @var GreenBox
@ -97,7 +98,10 @@ class Restore {
$command = dirname(__FILE__).'/../bin/restore.php'; $command = dirname(__FILE__).'/../bin/restore.php';
$runLog = "/dev/null"; $runLog = "/dev/null";
$params = "{$backup_file} {$this->statusFile} {$this->token} {$sessid}>> $runLog &"; $params = "{$backup_file} {$this->statusFile} {$this->token} {$sessid}>> $runLog &";
system("$command $params"); $ret = system("$command $params", $st);
if ($this->loglevel=='debug') {
$this->addLogItem("-I-".date("Ymd-H:i:s")." restore.php call: $st/$ret\n");
}
return array('token'=>$this->token); return array('token'=>$this->token);
} }
@ -185,7 +189,7 @@ class Restore {
$this->setEnviroment(); $this->setEnviroment();
// extract tarball // extract tarball
$command = 'tar -xf '.$backupfile.' --directory '.$this->tmpDir; $command = 'tar -xf '.$backupfile .' --directory '.$this->tmpDir;
$res = system($command); $res = system($command);
//$this->addLogItem('command: '.$command."\n"); //$this->addLogItem('command: '.$command."\n");
//$this->addLogItem('res: '.$res."\n"); //$this->addLogItem('res: '.$res."\n");
@ -215,6 +219,7 @@ class Restore {
return; return;
} }
file_put_contents($this->statusFile, 'success'); file_put_contents($this->statusFile, 'success');
// unlink($backupfile);
} }
@ -350,6 +355,7 @@ class Restore {
*/ */
function setEnviroment() function setEnviroment()
{ {
global $CC_CONFIG;
if ($this->loglevel=='debug') { if ($this->loglevel=='debug') {
$this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment\n"); $this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment\n");
} }