rework and simplify the eventscript handling

This version has no trailing whitespace, and fixed 


(This used to be ctdb commit defbe318152fc479e8076ad70433cdb4971951af)

1 files changed, 7 insertions, 4 deletions

diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h
index ba6a6752e6..9d033a9d7e 100644
--- a/ctdb/include/ctdb_private.h
+++ b/ctdb/include/ctdb_private.h
@@ -448,12 +448,15 @@ struct ctdb_context {
 	int start_as_disabled;
 	int start_as_stopped;
 	uint32_t event_script_timeouts; /* counting how many consecutive times an eventscript has timedout */
-	TALLOC_CTX *eventscripts_ctx; /* a context to hold data for the RUN_EVENTSCRIPTS control */
 	uint32_t *recd_ping_count;
 	TALLOC_CTX *release_ips_ctx; /* a context used to automatically drop all IPs if we fail to recover the node */
-	TALLOC_CTX *script_monitor_ctx; /* a context where we store results while running the monitor event */
-	TALLOC_CTX *last_monitor_ctx; 
-	TALLOC_CTX *event_script_ctx;  /* non-monitoring events */
+
+	TALLOC_CTX *monitor_event_script_ctx;
+	TALLOC_CTX *other_event_script_ctx;
+
+	struct ctdb_monitor_script_status_ctx *current_monitor_status_ctx;
+	struct ctdb_monitor_script_status_ctx *last_monitor_status_ctx;
+
 	TALLOC_CTX *banning_ctx;
 };