Sfoglia il codice sorgente

LOG: get the logging to work from loaded quorum modules

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>
Reviewed-by: Steven Dake <sdake@redhat.com>
Angus Salkeld 14 anni fa
parent
commit
94b11502cb
2 ha cambiato i file con 12 aggiunte e 2 eliminazioni
  1. 3 2
      exec/service.c
  2. 9 0
      exec/vsf_quorum.c

+ 3 - 2
exec/service.c

@@ -205,11 +205,12 @@ unsigned int corosync_service_link_and_init (
 
 
 	ais_service[service->id] = service;
 	ais_service[service->id] = service;
 
 
-	/* begin */
+	/*
+	 * Register the log sites with libqb
+	 */
 	_start = lcr_ifact_addr_get(handle, "__start___verbose");
 	_start = lcr_ifact_addr_get(handle, "__start___verbose");
 	_stop = lcr_ifact_addr_get(handle, "__stop___verbose");
 	_stop = lcr_ifact_addr_get(handle, "__stop___verbose");
 	qb_log_callsites_register(_start, _stop);
 	qb_log_callsites_register(_start, _stop);
-	/* end */
 
 
 	if (service->config_init_fn) {
 	if (service->config_init_fn) {
 		res = service->config_init_fn (corosync_api);
 		res = service->config_init_fn (corosync_api);

+ 9 - 0
exec/vsf_quorum.c

@@ -284,6 +284,8 @@ static int quorum_exec_init_fn (struct corosync_api_v1 *api)
 	char *quorum_module;
 	char *quorum_module;
 	int res;
 	int res;
 	void *quorum_iface_p;
 	void *quorum_iface_p;
+	void* _start;
+	void* _stop;
 
 
 #ifdef COROSYNC_SOLARIS
 #ifdef COROSYNC_SOLARIS
 	logsys_subsys_init();
 	logsys_subsys_init();
@@ -328,6 +330,13 @@ static int quorum_exec_init_fn (struct corosync_api_v1 *api)
 			log_printf (LOGSYS_LEVEL_NOTICE,
 			log_printf (LOGSYS_LEVEL_NOTICE,
 				    "Using quorum provider %s\n", quorum_module);
 				    "Using quorum provider %s\n", quorum_module);
 
 
+			/*
+			 * Register the log sites with libqb
+			 */
+			_start = lcr_ifact_addr_get(q_handle, "__start___verbose");
+			_stop = lcr_ifact_addr_get(q_handle, "__stop___verbose");
+			qb_log_callsites_register(_start, _stop);
+
 			quorum_iface = (struct quorum_services_api_ver1 *)quorum_iface_p;
 			quorum_iface = (struct quorum_services_api_ver1 *)quorum_iface_p;
 			quorum_iface->init (api, quorum_api_set_quorum);
 			quorum_iface->init (api, quorum_api_set_quorum);
 		}
 		}