Skip to content

Commit 0fb788b

Browse files
author
Till Brehm
committed
Merge branch 'xxxx-running_on_master' into 'develop'
Add a util function running_on_master() to improve code readablility See merge request ispconfig/ispconfig3!1735
2 parents 2cc4439 + 9f769b4 commit 0fb788b

15 files changed

+50
-30
lines changed

‎server/lib/app.inc.php‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,26 @@ function error($msg) {
354354
$this->log($msg, 3); // isn't this supposed to be error code 2? (gwyneth 20220315)
355355
die($msg);
356356
}
357+
358+
/**
359+
* Determin if the current process is running on the master or a slave server.
360+
*
361+
* @return boolean
362+
*/
363+
function running_on_masterserver() {
364+
365+
return $this->dbmaster == $this->db;
366+
}
367+
368+
/**
369+
* Determin if the current process is running on the master or a slave server.
370+
*
371+
* @return boolean
372+
*/
373+
function running_on_slaveserver() {
374+
375+
return $this->dbmaster != $this->db;
376+
}
357377
}
358378

359379
/**

‎server/lib/classes/aps_installer.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -693,7 +693,7 @@ public function installHandler($instanceid, $type)
693693
{
694694
$app->db->query('DELETE FROM aps_instances WHERE id = ?', $task['instance_id']);
695695
$app->db->query('DELETE FROM aps_instances_settings WHERE instance_id = ?', $task['instance_id']);
696-
if ($app->dbmaster != $app->db) {
696+
if (!$app->running_on_masterserver()) {
697697
$app->dbmaster->query('DELETE FROM aps_instances WHERE id = ?', $task['instance_id']);
698698
$app->dbmaster->query('DELETE FROM aps_instances_settings WHERE instance_id = ?', $task['instance_id']);
699699
}

‎server/lib/classes/backup.inc.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ public static function deleteBackup($backup_format, $backup_password, $backup_di
504504
if ($success) {
505505
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
506506
$app->db->query($sql, $server_id, $domain_id, $filename);
507-
if($app->db->dbHost != $app->dbmaster->dbHost)
507+
if($app->running_on_slaveserver())
508508
$app->dbmaster->query($sql, $server_id, $domain_id, $filename);
509509
$app->log($sql . ' - ' . json_encode([$server_id, $domain_id, $filename]), LOGLEVEL_DEBUG);
510510
}
@@ -1126,7 +1126,7 @@ protected static function clearBackups($server_id, $web_id, $max_backup_copies,
11261126
$password = NULL;
11271127

11281128
$db_list = array($app->db);
1129-
if ($app->db->dbHost != $app->dbmaster->dbHost)
1129+
if ($app->running_on_slaveserver())
11301130
array_push($db_list, $app->dbmaster);
11311131

11321132
if ($backup_mode == "userzip" || $backup_mode == "rootgz") {
@@ -1256,7 +1256,7 @@ protected static function backups_garbage_collection($server_id, $backup_type =
12561256
}
12571257

12581258
$db_list = array($app->db);
1259-
if ($app->db->dbHost != $app->dbmaster->dbHost)
1259+
if ($app->running_on_slaveserver())
12601260
array_push($db_list, $app->dbmaster);
12611261

12621262
// Cleanup web_backup entries for non-existent backup files
@@ -1776,7 +1776,7 @@ protected static function make_database_backup($web_domain, $backup_job)
17761776
//* password is for `Encrypted` column informative purposes, on download password is obtained from web_domain settings
17771777
$password = $repos_password ? '*secret*' : '';
17781778
$app->db->query($sql, $server_id, $domain_id, 'mysql', $backup_mode, $backup_format_db, time(), $db_backup_archive, $archive_size, $password);
1779-
if ($app->db->dbHost != $app->dbmaster->dbHost)
1779+
if ($app->running_on_slaveserver())
17801780
$app->dbmaster->query($sql, $server_id, $domain_id, 'mysql', $backup_mode, $backup_format_db, time(), $db_backup_archive, $archive_size, $password);
17811781
$success = true;
17821782
} else {
@@ -1832,7 +1832,7 @@ protected static function make_database_backup($web_domain, $backup_job)
18321832
//Making compatible with previous versions of ISPConfig:
18331833
$sql_mode = ($backup_format_db == 'gzip') ? 'sqlgz' : ('sql' . $backup_format_db);
18341834
$app->db->query($sql, $server_id, $domain_id, 'mysql', $sql_mode, $backup_format_db, time(), $db_compressed_file, $file_size, $password);
1835-
if ($app->db->dbHost != $app->dbmaster->dbHost)
1835+
if ($app->running_on_slaveserver())
18361836
$app->dbmaster->query($sql, $server_id, $domain_id, 'mysql', $sql_mode, $backup_format_db, time(), $db_compressed_file, $file_size, $password);
18371837
$success = true;
18381838
}
@@ -1982,7 +1982,7 @@ protected static function make_web_backup($web_domain, $backup_job)
19821982
$sql = "INSERT INTO web_backup (server_id, parent_domain_id, backup_type, backup_mode, backup_format, tstamp, filename, filesize, backup_password) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
19831983
$backup_time = time();
19841984
$app->db->query($sql, $server_id, $web_id, 'web', $backup_mode, $backup_format_web, $backup_time, $web_backup_archive, $archive_size, $password);
1985-
if ($app->db->dbHost != $app->dbmaster->dbHost)
1985+
if ($app->running_on_slaveserver())
19861986
$app->dbmaster->query($sql, $server_id, $web_id, 'web', $backup_mode, $backup_format_web, $backup_time, $web_backup_archive, $archive_size, $password);
19871987
unset($archive_size);
19881988
$app->log('Backup of web files for domain ' . $web_domain['domain'] . ' completed successfully to archive ' . $full_archive_path, LOGLEVEL_DEBUG);
@@ -2004,7 +2004,7 @@ protected static function make_web_backup($web_domain, $backup_job)
20042004
$file_size = filesize($full_filename);
20052005
$sql = "INSERT INTO web_backup (server_id, parent_domain_id, backup_type, backup_mode, backup_format, tstamp, filename, filesize, backup_password) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)";
20062006
$app->db->query($sql, $server_id, $web_id, 'web', $backup_mode, $backup_format_web, time(), $web_backup_file, $file_size, $password);
2007-
if ($app->db->dbHost != $app->dbmaster->dbHost)
2007+
if ($app->running_on_slaveserver())
20082008
$app->dbmaster->query($sql, $server_id, $web_id, 'web', $backup_mode, $backup_format_web, time(), $web_backup_file, $file_size, $password);
20092009
unset($file_size);
20102010
$app->log('Backup of web files for domain ' . $web_domain['domain'] . ' completed successfully to file ' . $full_filename, LOGLEVEL_DEBUG);

‎server/lib/classes/cron.d/200-logfiles.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ public function onRunJob() {
226226
// Cleanup logs in master database (only the "master-server")
227227
//######################################################################################################
228228

229-
if ($app->dbmaster == $app->db) {
229+
if ($app->running_on_masterserver()) {
230230
/** 7 days */
231231

232232

‎server/lib/classes/cron.d/300-quota_notify.inc.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ public function onRunJob() {
7575
// enforce traffic quota (run only on the "master-server")
7676
//######################################################################################################
7777

78-
if ($app->dbmaster == $app->db) {
78+
if ($app->running_on_masterserver()) {
7979

8080
$global_config = $app->getconf->get_global_config('mail');
8181

@@ -159,7 +159,7 @@ public function onRunJob() {
159159
// send website quota warnings by email
160160
//######################################################################################################
161161

162-
if ($app->dbmaster == $app->db) {
162+
if ($app->running_on_masterserver()) {
163163

164164
$global_config = $app->getconf->get_global_config('mail');
165165

@@ -315,7 +315,7 @@ public function onRunJob() {
315315
// send mail quota warnings by email
316316
//######################################################################################################
317317

318-
if ($app->dbmaster == $app->db) {
318+
if ($app->running_on_masterserver()) {
319319

320320
$global_config = $app->getconf->get_global_config('mail');
321321
$mail_config = $app->getconf->get_server_config($conf['server_id'], 'mail');
@@ -453,7 +453,7 @@ public function onRunJob() {
453453
// send database quota warnings by email
454454
//######################################################################################################
455455

456-
if ($app->dbmaster == $app->db) {
456+
if ($app->running_on_masterserver()) {
457457

458458
$global_config = $app->getconf->get_global_config('mail');
459459

‎server/lib/classes/cron.d/400-openvz.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public function onRunJob() {
5454
// deactivate virtual servers (run only on the "master-server")
5555
//######################################################################################################
5656

57-
if ($app->dbmaster == $app->db) {
57+
if ($app->running_on_masterserver()) {
5858
//* Check which virtual machines have to be deactivated
5959
$sql = "SELECT * FROM openvz_vm WHERE active = 'y' AND active_until_date IS NOT NULL AND active_until_date < CURDATE()";
6060
$records = $app->db->queryAllRecords($sql);

‎server/lib/classes/cron.d/500-backup_mail.inc.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public function onRunJob() {
184184
$filesize = filesize($mail_backup_dir.'/'.$mail_backup_file);
185185
$sql = "INSERT INTO mail_backup (server_id, parent_domain_id, mailuser_id, backup_mode, tstamp, filename, filesize) VALUES (?, ?, ?, ?, ?, ?, ?)";
186186
$app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id'], $backup_mode, time(), $mail_backup_file, $filesize);
187-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id'], $backup_mode, time(), $mail_backup_file, $filesize);
187+
if($app->running_on_slaveserver()) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id'], $backup_mode, time(), $mail_backup_file, $filesize);
188188
unset($filesize);
189189
} else {
190190
/* Backup failed - remove archive */
@@ -213,7 +213,7 @@ public function onRunJob() {
213213
unlink($mail_backup_dir.'/'.$files[$n]);
214214
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
215215
$app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $files[$n]);
216-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $files[$n]);
216+
if($app->running_on_slaveserver()) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $files[$n]);
217217
}
218218
}
219219
unset($files);
@@ -241,7 +241,7 @@ public function onRunJob() {
241241
/* remove backups from db */
242242
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND mailuser_id = ?";
243243
$app->db->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']);
244-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']);
244+
if($app->running_on_slaveserver()) $app->dbmaster->query($sql, $conf['server_id'], $domain_rec['domain_id'], $rec['mailuser_id']);
245245

246246
}
247247
}
@@ -254,7 +254,7 @@ public function onRunJob() {
254254
if(!is_file($mail_backup_dir.'/'.$backup['filename'])){
255255
$sql = "DELETE FROM mail_backup WHERE server_id = ? AND parent_domain_id = ? AND filename = ?";
256256
$app->db->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
257-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
257+
if($app->running_on_slaveserver()) $app->dbmaster->query($sql, $conf['server_id'], $backup['parent_domain_id'], $backup['filename']);
258258
}
259259
}
260260
}

‎server/lib/classes/cron.d/550-bind_dnssec.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function onRunJob() {
7878
global $app, $conf;
7979

8080
//* job should only run on ispc master
81-
if($app->db->dbHost != $app->dbmaster->dbHost) return;
81+
if($app->running_on_slaveserver()) return;
8282

8383
//* Load libraries
8484
$app->uses("getconf,tpl");

‎server/lib/classes/modules.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function processDatalog() {
100100
global $app, $conf;
101101

102102
//* If its a multiserver setup
103-
if($app->db->dbHost != $app->dbmaster->dbHost || ($app->db->dbHost == $app->dbmaster->dbHost && $app->db->dbName != $app->dbmaster->dbName)) {
103+
if($app->running_on_slaveserver() || ($app->running_on_masterserver() && $app->db->dbName != $app->dbmaster->dbName)) {
104104
if($conf['mirror_server_id'] > 0) {
105105
$sql = "SELECT * FROM sys_datalog WHERE datalog_id > ? AND (server_id = ? OR server_id = ? OR server_id = 0) ORDER BY datalog_id LIMIT 0,1000";
106106
} else {

‎server/plugins-available/apache2_plugin.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2411,7 +2411,7 @@ function delete($event_name, $data) {
24112411
//* cleanup database
24122412
$sql = "DELETE FROM web_backup WHERE server_id = ? AND parent_domain_id = ? AND filename LIKE ?";
24132413
$app->db->query($sql, $conf['server_id'], $data_old['domain_id'], "web".$data_old['domain_id']."_%");
2414-
if($app->db->dbHost != $app->dbmaster->dbHost) $app->dbmaster->query($sql, $conf['server_id'], $data_old['domain_id'], "web".$data_old['domain_id']."_%");
2414+
if($app->running_on_slaveserver()) $app->dbmaster->query($sql, $conf['server_id'], $data_old['domain_id'], "web".$data_old['domain_id']."_%");
24152415

24162416
$app->log('Deleted the web backup files', LOGLEVEL_DEBUG);
24172417
}

0 commit comments

Comments
 (0)