Attachment 647758 Details for Bug 876908 – Proposed patch - part 2 - Don't call reload on corosync-objctl actions

[patch] Proposed patch - part 2 - Don't call reload on corosync-objctl actions

2012-11-19-0002-Don-t-call-reload-on-corosync-objctl-actions.patch (text/plain), 1.46 KB, created by Jan Friesse on 2012-11-19 13:36:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Friesse

Created: 2012-11-19 13:36:50 UTC

Size: 1.46 KB

patch

obsolete

>From afb9d3fb27e8b5281254ff02634ef2fae6f298c9 Mon Sep 17 00:00:00 2001
>From: Jan Friesse <jfriesse@redhat.com>
>Date: Mon, 19 Nov 2012 14:28:30 +0100
>Subject: [PATCH 2/2] Don't call reload on corosync-objctl actions
>
>confdb reload is used only for reloading of file, not for triggering
>changes.
>
>Signed-off-by: Jan Friesse <jfriesse@redhat.com>
>---
> tools/corosync-objctl.c |   15 ---------------
> 1 files changed, 0 insertions(+), 15 deletions(-)
>
>diff --git a/tools/corosync-objctl.c b/tools/corosync-objctl.c
>index 3e2bd4c..1168efe 100644
>--- a/tools/corosync-objctl.c
>+++ b/tools/corosync-objctl.c
>@@ -244,18 +244,6 @@ static void print_config_tree(confdb_handle_t handle, hdb_handle_t parent_object
> 	}
> }
> 
>-static cs_error_t reload_db(confdb_handle_t handle)
>-{
>-	char error[1024];
>-	cs_error_t ret;
>-
>-	ret = confdb_reload(handle, 0, error, sizeof(error) - 1);
>-	if (ret != CONFDB_OK) {
>-		fprintf (stderr, "Error reloading DB %d\n", ret);
>-	}
>-	return ret;
>-}
>-
> static int read_in_config_file (char * filename)
> {
> 	confdb_handle_t handle;
>@@ -326,7 +314,6 @@ static int read_in_config_file (char * filename)
> 		/* write the attribute */
> 		write_key (handle, line);
> 	}
>-	reload_db(handle);
> 	confdb_finalize (handle);
> 	fclose (fh);
> 	return 0;
>@@ -931,8 +918,6 @@ int main (int argc, char *argv[]) {
> 	if (action == ACTION_TRACK) {
> 		listen_for_object_changes(handle);
> 		stop_tracking(handle);
>-	} else {
>-		reload_db(handle);
> 	}
> 
> 	result = confdb_finalize (handle);
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 876908: 647757 | 647758