diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/afb-config.c | 12 |
3 files changed, 7 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index eb2d2d12..3d7e1d07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,9 +114,8 @@ SET(binding_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb) ########################################################################### # activates the monitoring by default -set(INCLUDE_MONITORING ON CACHE BOOL "Activates installation of monitoring") if(INCLUDE_MONITORING) - add_definitions(-DWITH_MONITORING_OTPION) + add_definitions(-DWITH_MONITORING_OPTION) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test/monitoring DESTINATION diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 737faa66..fe40c4c6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -28,7 +28,6 @@ ADD_SUBDIRECTORY(tests) ADD_DEFINITIONS(-DBINDING_INSTALL_DIR="${binding_install_dir}") # Always add INFER_EXTENSION (more details in afb-hreq.c) ADD_DEFINITIONS(-DINFER_EXTENSION) -ADD_DEFINITIONS(-DAGL_DEVEL) ADD_LIBRARY(afb-lib STATIC afb-api.c diff --git a/src/afb-config.c b/src/afb-config.c index f08081f5..3a50e417 100644 --- a/src/afb-config.c +++ b/src/afb-config.c @@ -87,7 +87,7 @@ #define SET_TRACEEVT 'E' #define SET_EXEC 'e' #define DISPLAY_HELP 'h' -#if defined(WITH_MONITORING_OTPION) +#if defined(WITH_MONITORING_OPTION) #define SET_MONITORING 'M' #endif #define SET_TCP_PORT 'p' @@ -103,7 +103,7 @@ const char shortopts[] = "c:D:E:ehp:qrT:t:u:Vvw:" -#if defined(WITH_MONITORING_OTPION) +#if defined(WITH_MONITORING_OPTION) "M" #endif ; @@ -170,7 +170,7 @@ static AFB_options cliOptions[] = { {SET_NO_HTTPD, 0, "no-httpd", "Forbids HTTP service"}, {SET_EXEC, 0, "exec", "Execute the remaining arguments"}, -#if defined(WITH_MONITORING_OTPION) +#if defined(WITH_MONITORING_OPTION) {SET_MONITORING, 0, "monitoring", "enable HTTP monitoring at <ROOT>/monitoring/"}, #endif {0, 0, NULL, NULL} @@ -483,7 +483,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) case SET_SESSION_DIR: /* config->sessiondir = argvalstr(optc); */ - WARNING("Obsolete otpion %s ignored", name_of_option(optc)); + WARNING("Obsolete option %s ignored", name_of_option(optc)); break; case SET_UPLOAD_DIR: @@ -566,7 +566,7 @@ static void parse_arguments(int argc, char **argv, struct afb_config *config) config->random_token = 1; break; -#if defined(WITH_MONITORING_OTPION) +#if defined(WITH_MONITORING_OPTION) case SET_MONITORING: config->monitoring = 1; break; @@ -634,7 +634,7 @@ static void fulfill_config(struct afb_config *config) if (config->ldpaths == NULL && config->weak_ldpaths == NULL && !config->no_ldpaths) list_add(&config->ldpaths, BINDING_INSTALL_DIR); -#if defined(WITH_MONITORING_OTPION) +#if defined(WITH_MONITORING_OPTION) if (config->monitoring) list_add(&config->aliases, strdup("/monitoring:"BINDING_INSTALL_DIR"/monitoring")); #endif |