Repository: celix Updated Branches: refs/heads/develop 95c06ab78 -> e232322a0
Added new deploy target for rsa_dfi example. Clean up some printf. Split Celix DEBUG flag from civetweb DEBUG flag Project: http://git-wip-us.apache.org/repos/asf/celix/repo Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/e232322a Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/e232322a Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/e232322a Branch: refs/heads/develop Commit: e232322a0c0145b9cf0cc17881cd43a722974826 Parents: 95c06ab Author: gricciardi <[email protected]> Authored: Thu Nov 17 16:15:49 2016 +0100 Committer: gricciardi <[email protected]> Committed: Thu Nov 17 16:15:49 2016 +0100 ---------------------------------------------------------------------- .../discovery_etcd/private/src/etcd_watcher.c | 5 ----- remote_services/examples/CMakeLists.txt | 14 ++++++++++++++ .../rsa/private/src/import_registration_dfi.c | 2 +- remote_services/utils/private/src/civetweb.c | 10 +++++----- 4 files changed, 20 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/celix/blob/e232322a/remote_services/discovery_etcd/private/src/etcd_watcher.c ---------------------------------------------------------------------- diff --git a/remote_services/discovery_etcd/private/src/etcd_watcher.c b/remote_services/discovery_etcd/private/src/etcd_watcher.c index a7bcc2e..7e1ce33 100644 --- a/remote_services/discovery_etcd/private/src/etcd_watcher.c +++ b/remote_services/discovery_etcd/private/src/etcd_watcher.c @@ -363,26 +363,21 @@ celix_status_t etcdWatcher_create(discovery_pt discovery, bundle_context_pt cont status = etcd_init((char*)etcd_server, etcd_port); - printf(" ININT\n"); if (status == CELIX_SUCCESS) { etcdWatcher_addOwnFramework(*watcher); status = celixThreadMutex_create(&(*watcher)->watcherLock, NULL); - printf(" 111\n"); } if (status == CELIX_SUCCESS) { if (celixThreadMutex_lock(&(*watcher)->watcherLock) == CELIX_SUCCESS) { status = celixThread_create(&(*watcher)->watcherThread, NULL, etcdWatcher_run, *watcher); if (status == CELIX_SUCCESS) { - printf(" STARTEDTSTARTED\n"); (*watcher)->running = true; } celixThreadMutex_unlock(&(*watcher)->watcherLock); } } - - printf(" DONEDONE\n"); return status; } http://git-wip-us.apache.org/repos/asf/celix/blob/e232322a/remote_services/examples/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/remote_services/examples/CMakeLists.txt b/remote_services/examples/CMakeLists.txt index 1948c5b..f24fa6f 100644 --- a/remote_services/examples/CMakeLists.txt +++ b/remote_services/examples/CMakeLists.txt @@ -95,6 +95,20 @@ if (RSA_EXAMPLES) BUNDLES org.apache.celix.calc.api.Calculator_proxy ) endif () + + if (BUILD_RSA_DISCOVERY_ETCD AND BUILD_RSA_REMOTE_SERVICE_ADMIN_DFI) + add_deploy(remote-services-dfi + NAME "server" + GROUP "remote-services/remote-services-dfi" + BUNDLES discovery_etcd topology_manager remote_service_admin_dfi calculator shell shell_tui log_service log_writer + ) + + add_deploy("remote-services-dfi-client" + NAME "client" + GROUP "remote-services/remote-services-dfi" + BUNDLES topology_manager remote_service_admin_dfi shell shell_tui log_service log_writer calculator_shell discovery_etcd + ) + endif () endif (RSA_EXAMPLES) http://git-wip-us.apache.org/repos/asf/celix/blob/e232322a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c ---------------------------------------------------------------------- diff --git a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c b/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c index 7660f3e..0b8dcf7 100644 --- a/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c +++ b/remote_services/remote_service_admin_dfi/rsa/private/src/import_registration_dfi.c @@ -83,7 +83,7 @@ celix_status_t importRegistration_create(bundle_context_pt context, endpoint_des } if (status == CELIX_SUCCESS) { - printf("IMPORT REGISTRATION IS %p\n", reg); + //printf("IMPORT REGISTRATION IS %p\n", reg); *out = reg; } else{ http://git-wip-us.apache.org/repos/asf/celix/blob/e232322a/remote_services/utils/private/src/civetweb.c ---------------------------------------------------------------------- diff --git a/remote_services/utils/private/src/civetweb.c b/remote_services/utils/private/src/civetweb.c index 0639d08..a6093b7 100644 --- a/remote_services/utils/private/src/civetweb.c +++ b/remote_services/utils/private/src/civetweb.c @@ -363,7 +363,7 @@ void *pthread_getspecific(pthread_key_t key) #define ARRAY_SIZE(array) (sizeof(array) / sizeof(array[0])) #if !defined(DEBUG_TRACE) -#if defined(DEBUG) +#if defined(CWDEBUG) static void DEBUG_TRACE_FUNC(const char *func, unsigned line, PRINTF_FORMAT_STRING(const char *fmt), ...) PRINTF_ARGS(3, 4); @@ -386,7 +386,7 @@ static void DEBUG_TRACE_FUNC(const char *func, unsigned line, const char *fmt, . #else #define DEBUG_TRACE(fmt, ...) -#endif /* DEBUG */ +#endif /* CWDEBUG */ #endif /* DEBUG_TRACE */ #if defined(MEMORY_DEBUGGING) @@ -3284,7 +3284,7 @@ static void open_auth_file(struct mg_connection *conn, const char *path, if (gpass != NULL) { /* Use global passwords file */ if (!mg_fopen(conn, gpass, "r", filep)) { -#ifdef DEBUG +#ifdef CWDEBUG mg_cry(conn, "fopen(%s): %s", gpass, strerror(ERRNO)); #endif } @@ -3296,7 +3296,7 @@ static void open_auth_file(struct mg_connection *conn, const char *path, mg_snprintf(conn, name, sizeof(name), "%s%c%s", path, '/', PASSWORDS_FILE_NAME); if (!mg_fopen(conn, name, "r", filep)) { -#ifdef DEBUG +#ifdef CWDEBUG mg_cry(conn, "fopen(%s): %s", name, strerror(ERRNO)); #endif } @@ -3310,7 +3310,7 @@ static void open_auth_file(struct mg_connection *conn, const char *path, mg_snprintf(conn, name, sizeof(name), "%.*s%c%s", (int) (e - p), p, '/', PASSWORDS_FILE_NAME); if (!mg_fopen(conn, name, "r", filep)) { -#ifdef DEBUG +#ifdef CWDEBUG mg_cry(conn, "fopen(%s): %s", name, strerror(ERRNO)); #endif }
