kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bugfix do_actions, happy monkey was here !

This commit is contained in:
Alan Garcia 2014-03-07 12:48:16 +00:00
parent 13bbebaca1
commit 83733160e5
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
install/upgrades/3.1.0~a.sql
View File

@ -31,7 +31,7 @@ CREATE TABLE IF NOT EXISTS `vm_history` (
CREATE TABLE IF NOT EXISTS `actions` ( CREATE TABLE IF NOT EXISTS `actions` (
id bigint(20) unsigned NOT NULL AUTO_INCREMENT, id bigint(20) unsigned NOT NULL AUTO_INCREMENT,
type enum ('CREATE_FILE','CREATE_DIR','DELETE','MOVE','FIXDIR','FIXFILE', 'FIXUSER'), type enum ('CREATE_FILE','FIX_USER','CREATE_DIR','DELETE','MOVE','FIX_DIR','FIX_FILE'),
parameters longtext default NULL, parameters longtext default NULL,
creation timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, creation timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
begin timestamp, begin timestamp,

1
install/upgrades/3.3.0~a.sql
View File

@ -6,4 +6,5 @@ ALTER TABLE variable ADD strata_id bigint DEFAULT NULL;
ALTER TABLE variable ADD type text DEFAULT ''; ALTER TABLE variable ADD type text DEFAULT '';
ALTER TABLE variable ADD UNIQUE (name, strata, strata_id); ALTER TABLE variable ADD UNIQUE (name, strata, strata_id);
ALTER TABLE actions MODIFY COLUMN type enum('CREATE_FILE','FIX_USER','CREATE_DIR','DELETE','MOVE','FIX_DIR','FIX_FILE');

6
src/do_actions.php
View File

@ -93,7 +93,7 @@ if (file_exists($LOCK_FILE) !== false){
$params=unserialize($c["parameters"]); $params=unserialize($c["parameters"]);
// We can resume these types of action, so we reset the job to process it later // We can resume these types of action, so we reset the job to process it later
d("Previous job was the n°".$c["id"]." : '".$c["type"]."'"); d("Previous job was the n°".$c["id"]." : '".$c["type"]."'");
if($c["type"] == "CREATE_FILE" && is_dir(dirname($params["file"])) || $c["type"] == "CREATE_DIR" || $c["type"] == "DELETE" || $c["type"] == "FIXDIR" || $c["type"] == "FIXFILE"){ if($c["type"] == "CREATE_FILE" && is_dir(dirname($params["file"])) || $c["type"] == "CREATE_DIR" || $c["type"] == "DELETE" || $c["type"] == "FIX_DIR" || $c["type"] == "FIX_FILE"){
d("Reset of the job! So it will be resumed..."); d("Reset of the job! So it will be resumed...");
$action->reset_job($c["id"]); $action->reset_job($c["id"]);
}else{ }else{
@ -158,12 +158,12 @@ while ($rr=$action->get_action()){
if(!isset($output[0])) if(!isset($output[0]))
@exec("$SU mv -f ".$params["src"]." ".$params["dst"]." 2>&1", $output); @exec("$SU mv -f ".$params["src"]." ".$params["dst"]." 2>&1", $output);
break; break;
case "FIXDIR" : case "FIX_DIR" :
@exec("$FIXPERM -d ".$params["dir"]." 2>&1", $trash, $code); @exec("$FIXPERM -d ".$params["dir"]." 2>&1", $trash, $code);
if($code!=0) if($code!=0)
$output[0]="Fixperms.sh failed, returned error code : $code"; $output[0]="Fixperms.sh failed, returned error code : $code";
break; break;
case "FIXFILE" : case "FIX_FILE" :
@exec("$FIXPERM -f ".$params["file"]." 2>&1", $trash, $code); @exec("$FIXPERM -f ".$params["file"]." 2>&1", $trash, $code);
if($code!=0) if($code!=0)
$output[0]="Fixperms.sh failed, returned error code : $code"; $output[0]="Fixperms.sh failed, returned error code : $code";