// Define command line option
- #define SET_VERBOSE 101
- #define SET_BACKGROUND 105
- #define SET_FORGROUND 106
- #define KILL_PREV_EXIT 107
- #define KILL_PREV_REST 108
- #define SET_FAKE_MOD 109
-
- #define SET_TCP_PORT 120
- #define SET_ROOT_DIR 121
- #define SET_ROOT_BASE 122
- #define SET_ROOT_API 123
- #define SET_ROOT_ALIAS 124
-
- #define SET_CACHE_TO 130
- #define SET_USERID 131
- #define SET_PID_FILE 132
- #define SET_SESSION_DIR 133
- #define SET_CONFIG_FILE 134
- #define SET_CONFIG_SAVE 135
- #define SET_CONFIG_EXIT 138
-
- #define SET_SMACK 140
- #define SET_AUTH_TOKEN 141
- #define SET_PLUGINS 142
- #define SET_APITIMEOUT 143
- #define SET_CNTXTIMEOUT 144
-
- #define DISPLAY_VERSION 150
- #define DISPLAY_HELP 151
+#define SET_VERBOSE 101
+#define SET_BACKGROUND 105
+#define SET_FORGROUND 106
+#define KILL_PREV_EXIT 107
+#define KILL_PREV_REST 108
+#define SET_FAKE_MOD 109
+
+#define SET_TCP_PORT 120
+#define SET_ROOT_DIR 121
+#define SET_ROOT_BASE 122
+#define SET_ROOT_API 123
+#define SET_ROOT_ALIAS 124
+
+#define SET_CACHE_TO 130
+#define SET_USERID 131
+#define SET_PID_FILE 132
+#define SET_SESSION_DIR 133
+#define SET_CONFIG_FILE 134
+#define SET_CONFIG_SAVE 135
+#define SET_CONFIG_EXIT 138
+
+#define SET_AUTH_TOKEN 141
+#define SET_LDPATH 142
+#define SET_APITIMEOUT 143
+#define SET_CNTXTIMEOUT 144
+
+#define DISPLAY_VERSION 150
+#define DISPLAY_HELP 151
+
+#define SET_MODE 160
+#define SET_READYFD 161
// Supported option
{SET_CONFIG_SAVE ,0,"save" , "Save config on disk [default no]"},
{SET_CONFIG_EXIT ,0,"saveonly" , "Save config on disk and then exit"},
- {SET_SMACK ,1,"smack" , "Set Smack Label [default demo]"},
- {SET_PLUGINS ,1,"plugins" , "Load Plugins from dir [default = PLUGIN_INSTALL_DIR"},
+ {SET_LDPATH ,1,"ldpaths" , "Load Plugins from dir1:dir2:... [default = PLUGIN_INSTALL_DIR"},
{SET_AUTH_TOKEN ,1,"token" , "Initial Secret [default=no-session, --token="" for session without authentication]"},
{DISPLAY_VERSION ,0,"version" , "Display version and copyright"},
{DISPLAY_HELP ,0,"help" , "Display this help"},
+
+ {SET_MODE ,1,"mode" , "set the mode: either local, remote or global"},
+ {SET_READYFD ,1,"readyfd" , "set the #fd to signal when ready"},
{0, 0, 0}
};
fprintf (stderr," --%-15s %s\n", command, cliOptions[ind].help);
}
}
- fprintf (stderr,"Example:\n %s\\\n --verbose --port=1234 --smack=xxxx --token='azerty' --plugins=build/plugins\n", name);
+ fprintf (stderr,"Example:\n %s\\\n --verbose --port=1234 --token='azerty' --ldpaths=build/plugins:/usr/lib64/agl/plugins\n", name);
} // end printHelp
/*----------------------------------------------------------
err = httpdStart (session);
if (err != AFB_SUCCESS) return;
+ if (session->readyfd != 0) {
+ static const char readystr[] = "READY=1";
+ write(session->readyfd, readystr, sizeof(readystr) - 1);
+ close(session->readyfd);
+ }
+
// infinite loop
httpdLoop(session);
}
break;
- case SET_SMACK:
- if (optarg == 0) goto needValueForOption;
- fprintf (stderr, "Not Implemented yet\n");
- cliconfig.smack = optarg;
- break;
-
case SET_AUTH_TOKEN:
if (optarg == 0) goto needValueForOption;
cliconfig.token = optarg;
break;
- case SET_PLUGINS:
+ case SET_LDPATH:
if (optarg == 0) goto needValueForOption;
- cliconfig.plugins = optarg;
+ cliconfig.ldpaths = optarg;
break;
case SET_PID_FILE:
session->killPrevious = 2;
break;
+ case SET_MODE:
+ if (optarg == 0) goto needValueForOption;
+ if (!strcmp(optarg, "local")) cliconfig.mode = AFB_MODE_LOCAL;
+ else if (!strcmp(optarg, "remote")) cliconfig.mode = AFB_MODE_REMOTE;
+ else if (!strcmp(optarg, "global")) cliconfig.mode = AFB_MODE_GLOBAL;
+ else goto badMode;
+ break;
+
+ case SET_READYFD:
+ if (optarg == 0) goto needValueForOption;
+ if (!sscanf (optarg, "%u", &session->readyfd)) goto notAnInteger;
+ break;
+
case DISPLAY_VERSION:
if (optarg != 0) goto noValueForOption;
printVersion();
printHelp(programName);
goto normalExit;
- }
+ }
}
// if exist merge config file with CLI arguments
if ((session->background == 0) && (session->foreground == 0)) session->foreground=1;
// open syslog if ever needed
- openlog("AGB-log", 0, LOG_DAEMON);
+ openlog("AFB-log", 0, LOG_DAEMON);
- // -------------- Try to kill any previsou process if asked ---------------------
+ // -------------- Try to kill any previous process if asked ---------------------
if (session->killPrevious) {
pid = readPidFile (session->config); // enforce commandline option
switch (pid) {
if (status == -1) goto errorPidFile;
// we are in father process, we don't need this one
- exit (0);
+ _exit (0);
} // end background-foreground
normalExit:
closeSession (session); // try to close everything before leaving
if (verbose) printf ("\n---- Application Framework Binder Normal End ------\n");
- exit (0);
+ exit(0);
// ------------- Fatal ERROR display error and quit -------------
errorSetuid:
,gnuOptions[optionIndex].name, gnuOptions[optionIndex].name);
exit (-1);
+badMode:
+ fprintf (stderr,"\nERR:AFB-daemon option [--%s] only accepts local, global or remote.\n\n"
+ ,gnuOptions[optionIndex].name);
+ exit (-1);
+
exitOnSignal:
fprintf (stderr,"\n%s INF:AFB-daemon pid=%d received exit signal (Hopefully crtl-C or --kill-previous !!!)\n\n"
,configTime(), getpid());
Code Review / src / app-framework-binder.git / blobdiff