monitoring/NPalert/NPalert.spec | 7 ++++++-
monitoring/NPalert/scripts/ack-processor | 2 +-
monitoring/NPalert/scripts/notif-escalator | 6 +++---
monitoring/NPalert/scripts/notif-launcher | 4 ++--
monitoring/NPalert/scripts/notifier | 4 ++--
rel-eng/packages/NPalert | 2 +-
6 files changed, 15 insertions(+), 10 deletions(-)
New commits:
commit 7b994ab08b5940f68e9ecad3313e974d9a71582e
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 30 11:08:37 2012 +0100
Automatic commit of package [NPalert] release [1.126.30-1].
diff --git a/monitoring/NPalert/NPalert.spec b/monitoring/NPalert/NPalert.spec
index 9d81544..a7d8a90 100644
--- a/monitoring/NPalert/NPalert.spec
+++ b/monitoring/NPalert/NPalert.spec
@@ -9,7 +9,7 @@ Name: NPalert
Summary: NOCpulse notification system
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 1.126.29
+Version: 1.126.30
Release: 1%{?dist}
BuildArch: noarch
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo
$version))
@@ -137,6 +137,11 @@ fi
rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Jan 30 2012 Jan Pazdziora 1.126.30-1
+- Avoid having the messages on different lines than their timestamps.
+- Avoid having the output both in generate_config.log and GenerateNotifConfig-
+ error.log.
+
* Fri Jan 27 2012 Jan Pazdziora 1.126.29-1
- 730305 - Upon start, wait for generate-config to generate the config.
diff --git a/rel-eng/packages/NPalert b/rel-eng/packages/NPalert
index e8a0818..ba3d19a 100644
--- a/rel-eng/packages/NPalert
+++ b/rel-eng/packages/NPalert
@@ -1 +1 @@
-1.126.29-1 monitoring/NPalert/
+1.126.30-1 monitoring/NPalert/
commit de88e57e08988ff9ef965d2466f677011d2d7ead
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Jan 30 11:06:33 2012 +0100
Avoid having the messages on different lines than their timestamps.
diff --git a/monitoring/NPalert/scripts/ack-processor
b/monitoring/NPalert/scripts/ack-processor
index 903dc85..8eed893 100755
--- a/monitoring/NPalert/scripts/ack-processor
+++ b/monitoring/NPalert/scripts/ack-processor
@@ -70,7 +70,7 @@ while (1) {
# If a shutdown was requested, exit gracefully
if ($bailout) {
- $Log->log(1, "\n\nSystem shutdown requested\n\n");
+ $Log->log(1, "System shutdown requested\n");
$smtp->quit() if $smtp;
exit(0);
}
diff --git a/monitoring/NPalert/scripts/notif-escalator
b/monitoring/NPalert/scripts/notif-escalator
index 20282c6..18fabe0 100755
--- a/monitoring/NPalert/scripts/notif-escalator
+++ b/monitoring/NPalert/scripts/notif-escalator
@@ -86,7 +86,7 @@ $SIG{'PIPE'} = sub { $Log->log(1,"SIGPIPE
caught\n") };
my $STATE_FILE = "$tmp_dir/escalator.state";
my $Escalator;
- $Log->log(1,"\n\nSystem startup requested pid $$\n\n");
+ $Log->log(1,"System startup requested pid $$\n");
if (-r $STATE_FILE) {
$Log->log(3,"Opening escalator state file $STATE_FILE for system
initialization...\n");
$Escalator = NOCpulse::Notif::Escalator->from_file($STATE_FILE);
@@ -114,9 +114,9 @@ while (1) {
$Log->log(3,"Removed stale locks\n");
$Log->log(9,"@files\n");
}
- $Log->log(1,"\n\nSystem shutdown requested\n\n");
+ $Log->log(1,"System shutdown requested\n");
$Escalator->shut_down();
- $Log->log(1,"\n\nSystem shutdown completed\n\n");
+ $Log->log(1,"System shutdown completed\n");
exit(0);
}
diff --git a/monitoring/NPalert/scripts/notif-launcher
b/monitoring/NPalert/scripts/notif-launcher
index b08f31a..7bd0048 100755
--- a/monitoring/NPalert/scripts/notif-launcher
+++ b/monitoring/NPalert/scripts/notif-launcher
@@ -107,13 +107,13 @@ while (1) {
# If a shutdown was requested, exit gracefully
if ($bailout) {
- $Log->log(1,"\n\nSystem shutdown requested\n\n");
+ $Log->log(1,"System shutdown requested\n");
my @files=NOCpulse::Notif::AlertFile->remove_locks($TMPDIR,$program,$$);
if (scalar(@files)) {
$Log->log(3,"Removed stale locks\n");
$Log->log(9,"@files\n");
}
- $Log->log(1,"\n\nSystem shutdown completed\n\n");
+ $Log->log(1,"System shutdown completed\n");
exit(0);
}
diff --git a/monitoring/NPalert/scripts/notifier b/monitoring/NPalert/scripts/notifier
index 515d390..0313c13 100755
--- a/monitoring/NPalert/scripts/notifier
+++ b/monitoring/NPalert/scripts/notifier
@@ -87,7 +87,7 @@ while (1) {
# If a shutdown was requested, exit gracefully
if ($bailout) {
- $Log->log(1, "\n\nSystem shutdown requested\n\n");
+ $Log->log(1, "System shutdown requested\n");
my @files = NOCpulse::Notif::AlertFile->remove_locks($TMPDIR, $program, $$);
if (scalar(@files)) {
$Log->log(3, "Removed stale locks\n");
@@ -95,7 +95,7 @@ while (1) {
}
$smtp->quit() if $smtp;
$db->disconnect() if $db;
- $Log->log(1, "\n\nSystem shutdown completed\n\n");
+ $Log->log(1, "System shutdown completed\n");
exit(0);
} ## end if ($bailout)