packages: nagios-alert-jabber/nagios-alert-jabber.spec, nagios-alert-jabber...

[arekm]

Author: arekm                        Date: Fri Jun 10 10:26:55 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 7; use different resource for each script (in case when script is called twice at the same time

---- Files affected:
packages/nagios-alert-jabber:
   nagios-alert-jabber.spec (1.14 -> 1.15) , nagios-jabber.alert (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/nagios-alert-jabber/nagios-alert-jabber.spec
diff -u packages/nagios-alert-jabber/nagios-alert-jabber.spec:1.14 packages/nagios-alert-jabber/nagios-alert-jabber.spec:1.15
--- packages/nagios-alert-jabber/nagios-alert-jabber.spec:1.14	Tue Feb 22 18:13:40 2011
+++ packages/nagios-alert-jabber/nagios-alert-jabber.spec	Fri Jun 10 12:26:50 2011
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Program do wysyłania alarmów (Nagiosa) przez jabbera
 Name:		nagios-alert-jabber
 Version:	1.2
-Release:	6
+Release:	7
 License:	GPL
 Group:		Networking
 Source0:	nagios-jabber.alert
@@ -53,6 +53,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/06/10 10:26:50  arekm
+- rel 7; use different resource for each script (in case when script is called twice at the same time
+
 Revision 1.14  2011/02/22 17:13:40  arekm
 - rel 6; configurable timeout and lowered to 20s
 

================================================================
Index: packages/nagios-alert-jabber/nagios-jabber.alert
diff -u packages/nagios-alert-jabber/nagios-jabber.alert:1.17 packages/nagios-alert-jabber/nagios-jabber.alert:1.18
--- packages/nagios-alert-jabber/nagios-jabber.alert:1.17	Tue Feb 22 18:13:40 2011
+++ packages/nagios-alert-jabber/nagios-jabber.alert	Fri Jun 10 12:26:50 2011
@@ -127,7 +127,7 @@
 for section in jids:
 	jid = JID(section['jid'])
 	if not jid.resource:
-		jid = JID(jid.node, jid.domain, "Nagios")
+		jid = JID(jid.node, jid.domain, "Nagios/%d" % os.getpid())
 
 	c = Client(jid, section['password'], auth_methods = ['sasl:DIGEST-MD5', 'sasl:PLAIN', 'digest'],
 			tls_settings = TLSSettings(require = False, verify_peer = False))
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-alert-jabber/nagios-alert-jabber.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nagios-alert-jabber/nagios-jabber.alert?r1=1.17&r2=1.18&f=u