Code Review
/
src
/
app-framework-binder.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
afb-socket: Fix address reuse
[src/app-framework-binder.git]
/
src
/
afs-config.c
diff --git
a/src/afs-config.c
b/src/afs-config.c
index
eee4ccc
..
70a6d47
100644
(file)
--- a/
src/afs-config.c
+++ b/
src/afs-config.c
@@
-71,6
+71,7
@@
#define SET_NAME 'n'
#define SET_TCP_PORT 'p'
#define SET_QUIET 'q'
#define SET_NAME 'n'
#define SET_TCP_PORT 'p'
#define SET_QUIET 'q'
+#define WS_SERVICE 's'
#define SET_AUTH_TOKEN 't'
#define SET_UPLOAD_DIR 'u'
#define DISPLAY_VERSION 'V'
#define SET_AUTH_TOKEN 't'
#define SET_UPLOAD_DIR 'u'
#define DISPLAY_VERSION 'V'
@@
-78,7
+79,7
@@
#define SET_WORK_DIR 'w'
const char shortopts[] =
#define SET_WORK_DIR 'w'
const char shortopts[] =
- "hn:p:qrt:u:Vvw:"
+ "hn:p:qr
s:
t:u:Vvw:"
;
// Command line structure hold cli --command + help text
;
// Command line structure hold cli --command + help text
@@
-113,6
+114,7
@@
static AFB_options cliOptions[] = {
{SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=" AFS_SUPERVISOR_TOKEN ", use --token="" to allow any token]"},
{SET_AUTH_TOKEN, 1, "token", "Initial Secret [default=" AFS_SUPERVISOR_TOKEN ", use --token="" to allow any token]"},
+ {WS_SERVICE, 1, "ws-server", "Provide supervisor as websocket"},
{DISPLAY_VERSION, 0, "version", "Display version and copyright"},
{DISPLAY_HELP, 0, "help", "Display this help"},
{DISPLAY_VERSION, 0, "version", "Display version and copyright"},
{DISPLAY_HELP, 0, "help", "Display this help"},
@@
-261,11
+263,11
@@
static void parse_arguments(int argc, char **argv, struct afs_config *config)
while ((optc = getopt_long(argc, argv, shortopts, gnuOptions, NULL)) != EOF) {
switch (optc) {
case SET_VERBOSE:
while ((optc = getopt_long(argc, argv, shortopts, gnuOptions, NULL)) != EOF) {
switch (optc) {
case SET_VERBOSE:
- verbos
ity++
;
+ verbos
e_inc()
;
break;
case SET_QUIET:
break;
case SET_QUIET:
- verbos
ity--
;
+ verbos
e_dec()
;
break;
case SET_TCP_PORT:
break;
case SET_TCP_PORT:
@@
-324,6
+326,10
@@
static void parse_arguments(int argc, char **argv, struct afs_config *config)
config->name = argvalstr(optc);
break;
config->name = argvalstr(optc);
break;
+ case WS_SERVICE:
+ config->ws_server = argvalstr(optc);
+ break;
+
case DISPLAY_VERSION:
noarg(optc);
printVersion(stdout);
case DISPLAY_VERSION:
noarg(optc);
printVersion(stdout);
@@
-401,6
+407,7
@@
void afs_config_dump(struct afs_config *config)
S(uploaddir)
S(token)
S(name)
S(uploaddir)
S(token)
S(name)
+ S(ws_server)
D(httpdPort)
D(cacheTimeout)
D(httpdPort)
D(cacheTimeout)
@@
-434,7
+441,7
@@
struct afs_config *afs_config_parse_arguments(int argc, char **argv)
parse_environment(result);
parse_arguments(argc, argv, result);
fulfill_config(result);
parse_environment(result);
parse_arguments(argc, argv, result);
fulfill_config(result);
- if (verbos
ity >= 3
)
+ if (verbos
e_wants(Log_Level_Info)
)
afs_config_dump(result);
return result;
}
afs_config_dump(result);
return result;
}