X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fafs-config.c;h=2d42968515c1e4b06ec5abbd5aa720d7273c83ec;hb=a5143cea54e70859269556277353ceafedfa8895;hp=eee4ccc020ee1e12e5f9921091e72ef36f573a1e;hpb=8dc14014ad83952343d2473140103650555d5ea2;p=src%2Fapp-framework-binder.git

diff --git a/src/afs-config.c b/src/afs-config.c
index eee4ccc0..2d429685 100644
--- a/src/afs-config.c
+++ b/src/afs-config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2015-2018 "IoT.bzh"
+ * Copyright (C) 2015-2019 "IoT.bzh"
  * Author José Bollo <jose.bollo@iot.bzh>
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -71,6 +71,7 @@
 #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'
@@ -78,7 +79,7 @@
 #define SET_WORK_DIR       'w'
 
 const char shortopts[] =
-	"hn:p:qrt:u:Vvw:"
+	"hn:p:qrs:t:u:Vvw:"
 ;
 
 // 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]"},
 
+	{WS_SERVICE,        1, "ws-server",   "Provide supervisor as websocket"},
 	{DISPLAY_VERSION,   0, "version",     "Display version and copyright"},
 	{DISPLAY_HELP,      0, "help",        "Display this help"},
 
@@ -139,7 +141,7 @@ static void printVersion(FILE * file)
 		"\n"
 		"  afs-supervisor [Application Framework Supervisor] version="AFB_VERSION"\n"
 		"\n"
-		"  Copyright (C) 2015-2018 \"IoT.bzh\"\n"
+		"  Copyright (C) 2015-2019 \"IoT.bzh\"\n"
 		"  afs-supervisor comes with ABSOLUTELY NO WARRANTY.\n"
 		"  Licence Apache 2\n"
 		"\n";
@@ -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:
-			verbosity++;
+			verbose_inc();
 			break;
 
 		case SET_QUIET:
-			verbosity--;
+			verbose_dec();
 			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;
 
+		case WS_SERVICE:
+			config->ws_server = argvalstr(optc);
+			break;
+
 		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(ws_server)
 
 	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);
-	if (verbosity >= 3)
+	if (verbose_wants(Log_Level_Info))
 		afs_config_dump(result);
 	return result;
 }