From a105d81743257cd1fca644520903d84667cf7d0f Mon Sep 17 00:00:00 2001 From: tomash Date: Tue, 13 Feb 2007 16:50:01 +0000 Subject: [PATCH] #2183 probably solved - one 'private' to 'public' change and one 'global' statement added. --- .../src/modules/storageServer/var/Restore.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/campcaster/src/modules/storageServer/var/Restore.php b/campcaster/src/modules/storageServer/var/Restore.php index f4e9263bd..4859a6c49 100644 --- a/campcaster/src/modules/storageServer/var/Restore.php +++ b/campcaster/src/modules/storageServer/var/Restore.php @@ -44,8 +44,9 @@ class Restore { /** * @var string */ - private $loglevel = 'warn'; - #private $loglevel = 'debug'; + // private $loglevel = 'warn'; + public $loglevel = 'warn'; + // public $loglevel = 'debug'; /** * @var GreenBox @@ -97,7 +98,10 @@ class Restore { $command = dirname(__FILE__).'/../bin/restore.php'; $runLog = "/dev/null"; $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); } @@ -185,7 +189,7 @@ class Restore { $this->setEnviroment(); // extract tarball - $command = 'tar -xf '.$backupfile.' --directory '.$this->tmpDir; + $command = 'tar -xf '.$backupfile .' --directory '.$this->tmpDir; $res = system($command); //$this->addLogItem('command: '.$command."\n"); //$this->addLogItem('res: '.$res."\n"); @@ -215,6 +219,7 @@ class Restore { return; } file_put_contents($this->statusFile, 'success'); + // unlink($backupfile); } @@ -350,6 +355,7 @@ class Restore { */ function setEnviroment() { + global $CC_CONFIG; if ($this->loglevel=='debug') { $this->addLogItem("-I- ".date("Ymd-H:i:s")." setEnviroment\n"); }