Skip to contentSkip to conversation

fenced: don't send dbus signals if disabled

PATCH New Ryan O'Hara 2 participants 3 messages Feb 2, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 2/2 fenced: don't send dbus signals if disabled

This patch checks that dbus signals are not disabled before sending a dbus signal.

---
 fence/fenced/recover.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
fence/fenced/recover.c +3 -1
index 5d7680d..6fdd116 100644
@@ -384,7 +384,9 @@ void fence_victims(struct fd *fd)
 		log_error("fence %s %s", node->name,
 			  error ? "failed" : "success");
 
-		dbus_send(node->name, node->nodeid, error);
+		if (!optd_disable_dbus) {
+		    dbus_send(node->name, node->nodeid, error);
+		}
 
  skip_log_message:
 		if (!error) {
Signature · 1 line
1.7.2.3
#1 lore raw

PATCH 2/2 fenced: don't send dbus signals if disabled

Quoted 13 lines · Ryan O'Hara

This patch checks that dbus signals are not disabled before sending a dbus signal.

---
 fence/fenced/recover.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
fence/fenced/recover.c +0 -0
index 5d7680d..6fdd116 100644

fence/fenced/recover.c void fence_victims(struct fd *fd) · line 389

Quoted 7 lines
fence/fenced/recover.c +3 -1
@@ -384,7 +384,9 @@ void fence_victims(struct fd *fd)
 		log_error("fence %s %s", node->name,
 			  error ? "failed" : "success");
 
-		dbus_send(node->name, node->nodeid, error);
+		if (!optd_disable_dbus) {
+		    dbus_send(node->name, node->nodeid, error);
+		}

Indentation style doesn't match Dave's here or in dbus.c

I approve, but Dave really needs to sign off too.

-- Lon

#2 lore raw

PATCH 2/2 fenced: don't send dbus signals if disabled

Quoted 24 lines · Lon Hohberger
Quoted 13 lines · Ryan O'Hara

This patch checks that dbus signals are not disabled before sending a dbus signal.

---
 fence/fenced/recover.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
fence/fenced/recover.c +0 -0
index 5d7680d..6fdd116 100644

fence/fenced/recover.c void fence_victims(struct fd *fd) · line 389

Quoted 7 lines
fence/fenced/recover.c +3 -1
@@ -384,7 +384,9 @@ void fence_victims(struct fd *fd)
 		log_error("fence %s %s", node->name,
 			  error ? "failed" : "success");
 
-		dbus_send(node->name, node->nodeid, error);
+		if (!optd_disable_dbus) {
+		    dbus_send(node->name, node->nodeid, error);
+		}

Indentation style doesn't match Dave's here or in dbus.c

Quoted 3 lines

I approve, but Dave really needs to sign off too.

-- Lon

Yeah. I fixed the indentation in my local repo. Not planning to post another patch just for whitespace, unless someone insists.

Thanks for the review.

Ryan