diff options
| author |   Fulup Ar Foll <fulup@iot.bzh> | 2017-08-23 21:55:48 +0200 |
|---|---|---|
| committer | Fulup Ar Foll <fulup@iot.bzh> | 2017-08-23 21:55:48 +0200 |
| commit | de0a0595316d15c0cb639816fc3c0413541a49d5 (patch) | |
| tree | 77b797fa5099f59beb4355677431997090517a5f | |
| parent | 38f2492a94d42f2c45d76f81928a94d0184457b1 (diff) | |
Added sample for synchronous control request and update documentation
to support monitoring.
| -rw-r--r-- | README.md | 5 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 5 | ||||
| -rw-r--r-- | conf.d/project/lua.d/onload-daemon-04-oncall.lua | 10 | ||||
| -rw-r--r-- | conf.d/project/vscode.d/c_cpp_properties.json (renamed from conf.d/project/.vscode/c_cpp_properties.json) | 0 | ||||
| -rw-r--r-- | htdocs/index.html | 4 |
5 files changed, 17 insertions, 7 deletions
@@ -19,6 +19,11 @@ Controler AAAA(AGL Advance Audio Controler) and more. - Dependencies: the only dependencies are audio-common for JSON-WRAP and Filescan-utils capabilities. - Controler relies on Lua-5.3, when not needed Lua might be removed at compilation time. +## Monitoring + - Default test HTML page expect monitoring HTML page to be accessible from /monitoring for this to work you should + * place monitoring HTML pages in a well known location eg: $HOME/opt/monitoring + * start your binder with the alias option e.g. afb-daemon --port=1234 --alias=/monitoring:/home/fulup/opt/afb-monitoring --ldpaths=. --workdir=. --roothttp=../htdocs + ## Config Configuration is loaded dynamically during startup time. The controller scans CONTROL_CONFIG_PATH for a file corresponding to pattern diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index fec5082..b97cb7a 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -134,7 +134,10 @@ set(COMPILE_OPTIONS # Print a helper message when every thing is finished # ---------------------------------------------------- -set(CLOSING_MESSAGE "Debug from ./buid: afb-daemon --port=1234 --ldpaths=. --workdir=. --roothttp=../htdocs --tracereq=common --token='' --verbose") +if(IS_DIRECTORY $ENV{HOME}/opt/afb-monitoring) +set(MONITORING_ALIAS "--alias=/monitoring:$ENV{HOME}/opt/afb-monitoring") +endif() +set(CLOSING_MESSAGE "Debug from afb-daemon --port=1234 ${MONITORING_ALIAS} --ldpaths=. --workdir=. --roothttp=../htdocs --tracereq=common --token= --verbose ") set(PACKAGE_MESSAGE "Install widget file using in the target : afm-util install ${PROJECT_NAME}.wgt") # (BUG!!!) as PKG_CONFIG_PATH does not work [should be an env variable] diff --git a/conf.d/project/lua.d/onload-daemon-04-oncall.lua b/conf.d/project/lua.d/onload-daemon-04-oncall.lua index 4e78fd8..b450932 100644 --- a/conf.d/project/lua.d/onload-daemon-04-oncall.lua +++ b/conf.d/project/lua.d/onload-daemon-04-oncall.lua @@ -54,17 +54,17 @@ function _Test_Call_Async (request, args) } AFB:notice ("Test_Call_Async args=%s cb=Test_Async_CB", args) - AFB:service("alsacore","ping", "Test_Async_CB", context) + AFB:service("monitor","ping", "Test_Async_CB", context) end -function _Test_Call_Sync (request, args) +function _Simple_Monitor_Call (request, args) - AFB:notice ("Test_Call_Sync args=%s", args) - local err, response= AFB:servsync ("alsacore","ping", args) + AFB:notice ("_Simple_Server_Call args=%s", args) + local err, result= AFB:servsync ("monitor","get", args) if (err) then AFB:fail ("AFB:service_call_sync fail"); else - AFB:success (request, response) + AFB:success (request, result["response"]) end end diff --git a/conf.d/project/.vscode/c_cpp_properties.json b/conf.d/project/vscode.d/c_cpp_properties.json index 5512cb3..5512cb3 100644 --- a/conf.d/project/.vscode/c_cpp_properties.json +++ b/conf.d/project/vscode.d/c_cpp_properties.json diff --git a/htdocs/index.html b/htdocs/index.html index 52baba3..3d51f2f 100644 --- a/htdocs/index.html +++ b/htdocs/index.html @@ -9,7 +9,8 @@ <body onload="init('hal_registry','alsacore', 'hallist')"> <h1>Simple Control Test</h1> - <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button> + <button id="connected" onclick="init('hal_registry','alsacore', 'hallist')">Binder WS Fail</button> + <button id="mnitoring" onclick="window.open('/monitoring/monitor.html','_monitor_ctl')">Debug/Monitoring</a></button> <br><br> @@ -21,6 +22,7 @@ <li><button onclick="callbinder('control','request' ,{'target':'_Simple_Timer_Test',args:{'label':'myTimer', 'delay':3000, 'count':10}});">Start Events Timer</button></li> <br> <li><button onclick="callbinder('control','request' ,{'target':'_Simple_Echo_Args', 'args':{speed:20}});">Simple Echo args</button></li> + <li><button onclick="callbinder('control','request' ,{'target':'_Simple_Monitor_Call', 'args':{verbosity:true}});">Service Call to Monitor</button></li> <br> <li><button onclick="callbinder('control','debuglua' ,{'target':'helloworld', args:{'arg1':'abcd', 'next':7890, 'last':[1,2,3,4]}});">Lua Debug Script</button></li> |