aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLi Xiaoming <lixm.fnst@cn.fujitsu.com>2019-08-23 16:57:42 +0800
committerLi Xiaoming <lixm.fnst@cn.fujitsu.com>2019-08-23 16:57:42 +0800
commit87446697d54dd1eebe2f4b5528520af7a0e8f027 (patch)
tree74bc09d5c481dbbcf38137eb0707a8f049fb495d
parent6599a89df853f4a128906f26142d5b861de90656 (diff)
Fix binding example path & update afb-daemon options
Bug-AGL: SPEC-2714 Change-Id: I78aee6b3d96728a7eb394ddd94000c516fbc63ba Signed-off-by: Li Xiaoming <lixm.fnst@cn.fujitsu.com>
-rw-r--r--docs/afb-binding-writing.md6
-rw-r--r--docs/afb-daemon-options.md13
2 files changed, 10 insertions, 9 deletions
diff --git a/docs/afb-binding-writing.md b/docs/afb-binding-writing.md
index e1401d8e..3e4abe32 100644
--- a/docs/afb-binding-writing.md
+++ b/docs/afb-binding-writing.md
@@ -105,7 +105,7 @@ gcc -fPIC -shared tuto-1.c -o tuto-1.so $(pkg-config --cflags-only-I afb-daemon)
Running:
```bash
-afb-daemon --binding tuto-1.so --port 3333 --token ''
+afb-daemon --binding ./tuto-1.so --port 3333 --token ''
```
At this point, afb-daemon has started, it loaded the binding tuto-1.so and now
@@ -356,7 +356,7 @@ gcc -fPIC -shared tuto-2.c -o tuto-2.so $(pkg-config --cflags --libs afb-daemon)
Running:
```bash
-afb-daemon --binding tuto-2.so --port 3333 --token ''
+afb-daemon --binding ./tuto-2.so --port 3333 --token ''
```
Testing:
@@ -401,7 +401,7 @@ ON-REPLY 4:tuto-2/action: OK
}
```
-In an other terminal:
+In another terminal:
```bash
$ afb-client-demo -H localhost:3333/api?token=toto
diff --git a/docs/afb-daemon-options.md b/docs/afb-daemon-options.md
index 0588fef2..d8618bba 100644
--- a/docs/afb-daemon-options.md
+++ b/docs/afb-daemon-options.md
@@ -9,7 +9,7 @@ The launch options for binder **afb-daemon** are:
-l, --log=xxxx Tune log level
--foreground Get all in foreground mode
--background Get all in background mode
- --daemon Get all in background mode
+ -D, --daemon Get all in background mode
-n, --name=xxxx Set the visible name
-p, --port=xxxx HTTP listening TCP port [default 1234]
--roothttp=xxxx HTTP Root Directory [default no root http (files not served but apis still available)]
@@ -20,9 +20,9 @@ The launch options for binder **afb-daemon** are:
--cntxtimeout=xxxx Client Session Context Timeout [default 32000000]
--cache-eol=xxxx Client cache end of live [default 100000]
-w, --workdir=xxxx Set the working directory [default: $PWD or current working directory]
- -u, --uploaddir=xxxx Directory for uploading files [default: workdir]
- --rootdir=xxxx Root Directory of the application [default: workdir]
- --ldpaths=xxxx Load bindings from dir1:dir2:... [default = /opt/jobol/lib64/afb]
+ -u, --uploaddir=xxxx Directory for uploading files [default: workdir] relative to workdir
+ --rootdir=xxxx Root Directory of the application [default: workdir] relative to workdir
+ --ldpaths=xxxx Load bindings from dir1:dir2:... [default: path of afb-dbus-binding.so]
-b, --binding=xxxx Load the binding of path
--weak-ldpaths=xxxx Same as --ldpaths but ignore errors
--no-ldpaths Discard default ldpaths loading
@@ -41,14 +41,15 @@ The launch options for binder **afb-daemon** are:
--traceglob=xxxx Log the globals: none, all
--traceditf=xxxx Log the daemons: no, common, all
--tracesvc=xxxx Log the services: no, all
- --call=xxxx call at start format of val: API/VERB:json-args
+ --call=xxxx call at start, format of val: API/VERB:json-args
--no-httpd Forbid HTTP service
-e, --exec Execute the remaining arguments
-M, --monitoring Enable HTTP monitoring at <ROOT>/monitoring/
-C, --config=xxxx Load options from the given config file
-Z, --dump-config Dump the config to stdout and exit
-s, --set=xxxx Set parameters ([API]/[KEY]:JSON or {"API":{"KEY":JSON}}
- -o, --output=xxxx Redirect stdout and stderr to output file
+ -o, --output=xxxx Redirect stdout and stderr to output file (when --daemon)
+ --trap-faults=xxxx Trap faults: on, off, yes, no, true, false, 1, 0 (default: true)
```
## help