Skip to content
Snippets Groups Projects
Commit 3d46303e authored by tbrehm's avatar tbrehm
Browse files

Enabled locking mechanism for server script.

parent 797afa4c
No related branches found
No related tags found
No related merge requests found
...@@ -49,13 +49,14 @@ if($server_db_record == false) { ...@@ -49,13 +49,14 @@ if($server_db_record == false) {
} }
*/ */
/*
// Check if another process is running // Check if another process is running
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){ if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
clearstatcache(); clearstatcache();
for($i=0;$i<120;$i++){ // Wait max. 120 sec, then proceed for($i=0;$i<120;$i++){ // Wait max. 1200 sec, then proceed
if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){ if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
sleep(1); $app->log("There is already a lockfile set. Waiting another 10 seconds...", LOGLEVEL_DEBUG);
sleep(10);
clearstatcache(); clearstatcache();
} }
} }
...@@ -64,7 +65,7 @@ if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){ ...@@ -64,7 +65,7 @@ if(is_file($conf["temppath"].$conf["fs_div"].".ispconfig_lock")){
// Set Lockfile // Set Lockfile
@touch($conf["temppath"].$conf["fs_div"].".ispconfig_lock"); @touch($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
$app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG); $app->log("Set Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock", LOGLEVEL_DEBUG);
*/
if($app->dbmaster->connect()) { if($app->dbmaster->connect()) {
...@@ -116,11 +117,11 @@ if($app->dbmaster->connect()) { ...@@ -116,11 +117,11 @@ if($app->dbmaster->connect()) {
$app->log("Unable to connect to master server.",LOGLEVEL_ERROR); $app->log("Unable to connect to master server.",LOGLEVEL_ERROR);
} }
/*
// Remove lock // Remove lock
@unlink($conf["temppath"].$conf["fs_div"].".ispconfig_lock"); @unlink($conf["temppath"].$conf["fs_div"].".ispconfig_lock");
$app->log("Remove Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock",LOGLEVEL_DEBUG); $app->log("Remove Lock: ".$conf["temppath"].$conf["fs_div"].".ispconfig_lock",LOGLEVEL_DEBUG);
*/
die("finished.\n"); die("finished.\n");
?> ?>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment