paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2576 from hunter-nl/hunter-nl-patch-1 

imapsync command execution changed
master
André Peters 2019-05-04 20:31:04 +02:00 committed by GitHub
parent b09fab9125 e59417ed78
commit 85e686d194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
data/Dockerfiles/dovecot/imapsync_cron.pl
View File

@ -18,14 +18,6 @@ if ($imapsync_running eq 1)
exit; exit;
} }
sub qqw($) {
my @values = split('(?=--)', $_[0]);
foreach my $val (@values) {
$val=trim($val);
}
return @values
}
$run_dir="/tmp"; $run_dir="/tmp";
$dsn = 'DBI:mysql:database=__DBNAME__;mysql_socket=/var/run/mysqld/mysqld.sock'; $dsn = 'DBI:mysql:database=__DBNAME__;mysql_socket=/var/run/mysqld/mysqld.sock';
$lock_file = $run_dir . "/imapsync_busy"; $lock_file = $run_dir . "/imapsync_busy";
@ -101,10 +93,6 @@ while ($row = $sth->fetchrow_arrayref()) {
$timeout1 = @$row[19]; $timeout1 = @$row[19];
$timeout2 = @$row[20]; $timeout2 = @$row[20];
$is_running = $dbh->prepare("UPDATE imapsync SET is_running = 1 WHERE id = ?");
$is_running->bind_param( 1, ${id} );
$is_running->execute();
if ($enc1 eq "TLS") { $enc1 = "--tls1"; } elsif ($enc1 eq "SSL") { $enc1 = "--ssl1"; } else { undef $enc1; } if ($enc1 eq "TLS") { $enc1 = "--tls1"; } elsif ($enc1 eq "SSL") { $enc1 = "--ssl1"; } else { undef $enc1; }
my $template = $run_dir . '/imapsync.XXXXXXX'; my $template = $run_dir . '/imapsync.XXXXXXX';
@ -114,47 +102,53 @@ while ($row = $sth->fetchrow_arrayref()) {
print $passfile1 "$password1\n"; print $passfile1 "$password1\n";
print $passfile2 trim($master_pass) . "\n"; print $passfile2 trim($master_pass) . "\n";
my @custom_params_a = qqw($custom_params); my $command = "/usr/local/bin/imapsync";
my $custom_params_ref = \@custom_params_a; $command .= " --tmpdir /tmp";
$command .= " --pidfile /tmp/imapsync.pid";
my $generated_cmds = [ "/usr/local/bin/imapsync", $command .= " --nofoldersizes";
"--tmpdir", "/tmp", ($timeout1 gt "0" ? () : ($command .= " --timeout1 ${timeout1}"));
"--nofoldersizes", ($timeout2 gt "0" ? () : ($command .= " --timeout2 ${timeout2}"));
($timeout1 gt "0" ? () : ('--timeout1', $timeout1)), ($exclude eq "" ? () : ($command .= qq` --exclude ${exclude}`));
($timeout2 gt "0" ? () : ('--timeout2', $timeout2)), ($subfolder2 eq "" ? () : ($command .= qq` --subfolder2 ${subfolder2}`));
($exclude eq "" ? () : ("--exclude", $exclude)), ($maxage eq "0" ? () : ($command .= " --maxage ${maxage}"));
($subfolder2 eq "" ? () : ('--subfolder2', $subfolder2)), ($maxbytespersecond eq "0" ? () : ($command .= " --maxbytespersecond ${maxbytespersecond}"));
($maxage eq "0" ? () : ('--maxage', $maxage)), ($delete2duplicates ne "1" ? () : ($command .= " --delete2duplicates"));
($maxbytespersecond eq "0" ? () : ('--maxbytespersecond', $maxbytespersecond)), ($subscribeall ne "1" ? () : ($command .= " --subscribeall"));
($delete2duplicates ne "1" ? () : ('--delete2duplicates')), ($delete1 ne "1" ? () : ($command .= " --delete"));
($subscribeall ne "1" ? () : ('--subscribeall')), ($delete2 ne "1" ? () : ($command .= " --delete2"));
($delete1 ne "1" ? () : ('--delete')), ($automap ne "1" ? () : ($command .= " --automap"));
($delete2 ne "1" ? () : ('--delete2')), ($skipcrossduplicates ne "1" ? () : ($command .= " --skipcrossduplicates"));
($automap ne "1" ? () : ('--automap')), (!defined($enc1) ? () : ($command .= " ${enc1}"));
($skipcrossduplicates ne "1" ? () : ('--skipcrossduplicates')), $command .= " --host1 ${host1}";
(!defined($enc1) ? () : ($enc1)), $command .= qq` --user1 ${user1}`;
"--host1", $host1, $command .= " --passfile1 $passfile1->filename";
"--user1", $user1, $command .= " --port1 ${port1}";
"--passfile1", $passfile1->filename, $command .= " --host2 localhost";
"--port1", $port1, $command .= " --user2 ${user2}" . '*' . trim($master_user);
"--host2", "localhost", $command .= " --passfile2 $passfile2->filename";
"--user2", $user2 . '*' . trim($master_user), $command .= " --no-modulesversion";
"--passfile2", $passfile2->filename, ($custom_params eq "" ? () : ($command .= qq` ${custom_params}`));
'--no-modulesversion'];
try { try {
run [@$generated_cmds, @$custom_params_ref], '&>', \my $stdout; $is_running = $dbh->prepare("UPDATE imapsync SET is_running = 1 WHERE id = ?");
$is_running->bind_param( 1, ${id} );
$is_running->execute();
my $stdout = `${command}`
$update = $dbh->prepare("UPDATE imapsync SET returned_text = ?, last_run = NOW(), is_running = 0 WHERE id = ?"); $update = $dbh->prepare("UPDATE imapsync SET returned_text = ?, last_run = NOW(), is_running = 0 WHERE id = ?");
$update->bind_param( 1, ${stdout} ); $update->bind_param( 1, ${stdout} );
$update->bind_param( 2, ${id} ); $update->bind_param( 2, ${id} );
$update->execute(); $update->execute();
} catch { } catch {
$update = $dbh->prepare("UPDATE imapsync SET returned_text = 'Could not start or finish imapsync', last_run = NOW(), is_running = 0 WHERE id = ?"); $update = $dbh->prepare("UPDATE imapsync SET returned_text = 'Could not start or finish imapsync' WHERE id = ?");
$update->bind_param( 1, ${id} );
$update->execute();
} finally {
$update = $dbh->prepare("UPDATE imapsync SET last_run = NOW(), is_running = 0 WHERE id = ?");
$update->bind_param( 1, ${id} ); $update->bind_param( 1, ${id} );
$update->execute(); $update->execute();
$lockmgr->unlock($lock_file);
}; };
} }
$sth->finish(); $sth->finish();

4
data/web/inc/init_db.inc.php
View File

@ -3,7 +3,7 @@ function init_db_schema() {
try { try {
global $pdo; global $pdo;
$db_version = "30032019_1905"; $db_version = "04052019_1210";
$stmt = $pdo->query("SHOW TABLES LIKE 'versions'"); $stmt = $pdo->query("SHOW TABLES LIKE 'versions'");
$num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC)); $num_results = count($stmt->fetchAll(PDO::FETCH_ASSOC));
@ -502,7 +502,7 @@ function init_db_schema() {
"timeout2" => "SMALLINT NOT NULL DEFAULT '600'", "timeout2" => "SMALLINT NOT NULL DEFAULT '600'",
"subscribeall" => "TINYINT(1) NOT NULL DEFAULT '1'", "subscribeall" => "TINYINT(1) NOT NULL DEFAULT '1'",
"is_running" => "TINYINT(1) NOT NULL DEFAULT '0'", "is_running" => "TINYINT(1) NOT NULL DEFAULT '0'",
"returned_text" => "MEDIUMTEXT", "returned_text" => "LONGTEXT",
"last_run" => "TIMESTAMP NULL DEFAULT NULL", "last_run" => "TIMESTAMP NULL DEFAULT NULL",
"created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)", "created" => "DATETIME(0) NOT NULL DEFAULT NOW(0)",
"modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP", "modified" => "DATETIME ON UPDATE CURRENT_TIMESTAMP",