From: rmccabe@sourceware.org <rmccabe@sourceware.org>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] conga/luci/site/luci/Extensions LuciSyslog.py ...
Date: 20 Oct 2006 22:29:23 -0000 [thread overview]
Message-ID: <20061020222923.19935.qmail@sourceware.org> (raw)
CVSROOT: /cvs/cluster
Module name: conga
Changes by: rmccabe at sourceware.org 2006-10-20 22:29:22
Modified files:
luci/site/luci/Extensions: LuciSyslog.py cluster_adapters.py
ricci_bridge.py ricci_communicator.py
Log message:
fix debug output of ricci's sent data
fix openlog call
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciSyslog.py.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&r1=1.124&r2=1.125
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_bridge.py.diff?cvsroot=cluster&r1=1.30&r2=1.31
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ricci_communicator.py.diff?cvsroot=cluster&r1=1.13&r2=1.14
--- conga/luci/site/luci/Extensions/LuciSyslog.py 2006/10/20 22:20:43 1.6
+++ conga/luci/site/luci/Extensions/LuciSyslog.py 2006/10/20 22:29:22 1.7
@@ -15,7 +15,7 @@
def __init__(self):
self.__init = 0
try:
- openlog('luci', LOG_DAEMON, LOG_PID | LOG_NDELAY)
+ openlog('luci', LOG_PID | LOG_NDELAY, LOG_DAEMON)
self.__init = 1
except:
raise LuciSyslogError, 'unable to setup syslog functionality.'
--- conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/20 22:20:43 1.124
+++ conga/luci/site/luci/Extensions/cluster_adapters.py 2006/10/20 22:29:22 1.125
@@ -2242,7 +2242,7 @@
#First, delete cluster.conf from node to be deleted.
#next, have node leave cluster.
- batch_number, result = nodeLeaveCluster(rc)
+ batch_number, result = nodeLeaveCluster(rc, purge=True)
#It is not worth flagging this node in DB, as we are going
#to delete it anyway. Now, we need to delete node from model
--- conga/luci/site/luci/Extensions/ricci_bridge.py 2006/10/16 20:56:09 1.30
+++ conga/luci/site/luci/Extensions/ricci_bridge.py 2006/10/20 22:29:22 1.31
@@ -298,7 +298,7 @@
return (None, None)
return batchAttemptResult(doc)
-def nodeLeaveCluster(rc, cluster_shutdown=False, purge=True):
+def nodeLeaveCluster(rc, cluster_shutdown=False, purge=False):
cshutdown = 'false'
if cluster_shutdown == True:
cshutdown = 'true'
--- conga/luci/site/luci/Extensions/ricci_communicator.py 2006/10/20 20:00:29 1.13
+++ conga/luci/site/luci/Extensions/ricci_communicator.py 2006/10/20 22:29:22 1.14
@@ -47,7 +47,7 @@
hello = self.__receive()
try:
luci_log.debug_verbose('Received header from %s: \"%s\"' \
- % (self.__hostname, hello.toxml()))
+ % (self.__hostname, hello.toxml()))
except:
pass
@@ -267,8 +267,11 @@
raise RicciError, 'write error while sending XML to host %s' \
% self.__hostname
buff = buff[pos:]
- luci_log.debug_verbose('Sent XML \"%s\" to host %s' \
- % (buff, self.__hostname))
+ try:
+ luci_log.debug_verbose('Sent XML \"%s\" to host %s' \
+ % (xml_doc.toxml(), self.__hostname))
+ except:
+ pass
return
def __receive(self):
next reply other threads:[~2006-10-20 22:29 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-20 22:29 rmccabe [this message]
-- strict thread matches above, loose matches on Subject: below --
2006-11-29 18:15 [Cluster-devel] conga/luci/site/luci/Extensions LuciSyslog.py rmccabe
2006-11-06 20:21 rmccabe
2006-10-27 18:24 rmccabe
2006-10-24 16:36 rmccabe
2006-10-20 22:20 rmccabe
2006-10-20 20:00 rmccabe
2006-10-20 18:41 rmccabe
2006-10-18 21:59 rmccabe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20061020222923.19935.qmail@sourceware.org \
--to=rmccabe@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).