X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=server-src%2Famdump.pl;h=4caf7182bdcc8dece102e8b454df86de7b874e9f;hb=011a59f5a54864108a16af570a6b287410597cc2;hp=383fa85c7ed0356ad8504368ebf2ac6d782b4fcb;hpb=b116e9366c7b2ea2c2eb53b0a13df4090e176235;p=debian%2Famanda diff --git a/server-src/amdump.pl b/server-src/amdump.pl index 383fa85..4caf718 100644 --- a/server-src/amdump.pl +++ b/server-src/amdump.pl @@ -151,7 +151,7 @@ INFO amdump amdump pid $$ START driver date $timestamp ERROR amdump $msg EOF - run_subprocess("$sbindir/amreport", $config_name, '--from-amdump', '-l', $fakelogfile); + run_subprocess("$sbindir/amreport", $config_name, '--from-amdump', '-l', $fakelogfile, @config_overrides_opts); unlink($fakelogfile); # and we're done here @@ -164,7 +164,7 @@ sub do_amcleanup { # logfiles are still around. First, try an amcleanup -p to see if # the actual processes are already dead debug("runing amcleanup -p"); - run_subprocess("$sbindir/amcleanup", '-p', $config_name); + run_subprocess("$sbindir/amcleanup", '-p', $config_name, @config_overrides_opts); # and check again return unless -f $amdump_log_filename || -f $trace_log_filename; @@ -192,7 +192,8 @@ sub start_logfiles { # undef first.. stupid perl. debug("beginning amdump log"); $amdump_log = undef; - open($amdump_log, ">", $amdump_log_filename) + # Must be opened in append so that all subprocess can write to it. + open($amdump_log, ">>", $amdump_log_filename) or die("could not open amdump log file '$amdump_log_filename': $!"); } @@ -261,7 +262,7 @@ sub planner_driver_pipeline { sub do_amreport { debug("running amreport"); - run_subprocess("$sbindir/amreport", $config_name, '--from-amdump'); + run_subprocess("$sbindir/amreport", $config_name, '--from-amdump', @config_overrides_opts); } sub roll_trace_logs { @@ -272,12 +273,12 @@ sub roll_trace_logs { sub trim_trace_logs { debug("trimming old trace logs"); - run_subprocess("$amlibexecdir/amtrmlog", $config_name); + run_subprocess("$amlibexecdir/amtrmlog", $config_name, @config_overrides_opts); } sub trim_indexes { debug("trimming old indexes"); - run_subprocess("$amlibexecdir/amtrmidx", $config_name); + run_subprocess("$amlibexecdir/amtrmidx", $config_name, @config_overrides_opts); } sub roll_amdump_logs {