You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by bp...@apache.org on 2015/04/08 17:54:39 UTC

[1/2] celix git commit: CELIX-231: Added missing log_helper create, start, stop, destroy

Repository: celix
Updated Branches:
  refs/heads/develop e8984dad1 -> 3acf970c7


CELIX-231: Added missing log_helper create,start,stop,destroy


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/614b0bdc
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/614b0bdc
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/614b0bdc

Branch: refs/heads/develop
Commit: 614b0bdc27a92a655fab0b51517e6acc64d3e75d
Parents: b577cce
Author: Bjoern Petri <bj...@sundevil.de>
Authored: Wed Apr 8 08:55:35 2015 +0200
Committer: Bjoern Petri <bj...@sundevil.de>
Committed: Wed Apr 8 08:55:35 2015 +0200

----------------------------------------------------------------------
 remote_services/discovery_etcd/private/src/discovery_impl.c | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/614b0bdc/remote_services/discovery_etcd/private/src/discovery_impl.c
----------------------------------------------------------------------
diff --git a/remote_services/discovery_etcd/private/src/discovery_impl.c b/remote_services/discovery_etcd/private/src/discovery_impl.c
index 2e8be7f..b8d7d5c 100644
--- a/remote_services/discovery_etcd/private/src/discovery_impl.c
+++ b/remote_services/discovery_etcd/private/src/discovery_impl.c
@@ -68,6 +68,8 @@ celix_status_t discovery_create(bundle_context_pt context, discovery_pt *discove
 	status = celixThreadMutex_create(&(*discovery)->listenerReferencesMutex, NULL);
 	status = celixThreadMutex_create(&(*discovery)->discoveredServicesMutex, NULL);
 
+	logHelper_create(context, &(*discovery)->loghelper);
+
 	return status;
 }
 
@@ -98,6 +100,8 @@ celix_status_t discovery_destroy(discovery_pt discovery) {
 
 	celixThreadMutex_destroy(&discovery->listenerReferencesMutex);
 
+	logHelper_destroy(&discovery->loghelper);
+
 	free(discovery);
 
 	return status;
@@ -108,6 +112,7 @@ celix_status_t discovery_start(discovery_pt discovery) {
 	char *port = NULL;
 	char *path = NULL;
 
+	logHelper_start(discovery->loghelper);
 
 	bundleContext_getProperty(discovery->context, DISCOVERY_SERVER_PORT, &port);
 	if (port == NULL) {
@@ -170,6 +175,9 @@ celix_status_t discovery_stop(discovery_pt discovery) {
 
 	celixThreadMutex_unlock(&discovery->discoveredServicesMutex);
 
+
+	logHelper_stop(discovery->loghelper);
+
 	return status;
 }
 


[2/2] celix git commit: Merge branch 'hotfix/CELIX-231_Missing_log_helper_creation' into develop

Posted by bp...@apache.org.
Merge branch 'hotfix/CELIX-231_Missing_log_helper_creation' into develop


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/3acf970c
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/3acf970c
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/3acf970c

Branch: refs/heads/develop
Commit: 3acf970c79cd938a2c65ce090b6c7b6b97f564f8
Parents: e8984da 614b0bd
Author: Bjoern Petri <bj...@sundevil.de>
Authored: Wed Apr 8 17:54:17 2015 +0200
Committer: Bjoern Petri <bj...@sundevil.de>
Committed: Wed Apr 8 17:54:17 2015 +0200

----------------------------------------------------------------------
 remote_services/discovery_etcd/private/src/discovery_impl.c | 8 ++++++++
 1 file changed, 8 insertions(+)
----------------------------------------------------------------------