Skip to content

Commit 2a4b9b5

Browse files
committed
Merge branch 'master' of https://github.com/endurox-dev/endurox
2 parents 1b55fe1 + 3df4c29 commit 2a4b9b5

File tree

6 files changed

+138
-272
lines changed

6 files changed

+138
-272
lines changed

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,9 @@ EnduroX have binddings for:
1414

1515
Supported operating system: GNU/Linux, starting from 2.6.12 kernel (needed for POSIX Queues). Starting with Enduro/X Version 3.1.2 IBM AIX (6.1 and 7.1), Oracle Solaris 11, MAC OS X (experimental) and Cygwin (experimental) support is added. Supported compilers: gcc, LLVM clang, IBM xlC.
1616

17-
- Build and installation guides are located at: http://www.endurox.org
17+
- Build and installation guides are located at: www.endurox.org/dokuwiki
18+
19+
- Support forum: www.endurox.org
1820

1921
- Binary builds (RPMs & DEBs) for various platforms are here: http://www.endurox.org/projects/endurox/files
2022

cconfsrv/Makefile

Lines changed: 0 additions & 261 deletions
This file was deleted.

doc/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ find_program(DBLATEX "dblatex")
3737
set(PDF_NAMES ex_devguide ex_overview ex_adminman building_guide
3838
getting_started_tutorial persistent_message_queues_overview
3939
osx_notes aix_notes solaris_notes freebsd_notes
40-
benchmark)
40+
benchmark common_configuration)
4141
set(HTML_NAMES ex_devguide ex_overview ex_adminman building_guide
4242
getting_started_tutorial persistent_message_queues_overview
4343
osx_notes aix_notes solaris_notes freebsd_notes
44-
benchmark)
44+
benchmark common_configuration)
4545

4646
# Generate PDFs...
4747
if(DBLATEX)

doc/common_configuration.adoc

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Common Configuration
2+
====================
3+
Madars Vitolins
4+
v1.0, 2016-09:
5+
Initial draft
6+
:doctype: book
7+
8+
About the guide
9+
---------------
10+
This document describes new configuration principles used in Enduro/X. The configuration is based on
11+
ini files, the in 3.x series the old style configuration files (ndrxdebug.conf, q.conf) are still supported,
12+
but the same format data can be now passed into ini files.
13+
14+
== Moving environment variables to ini files
15+
16+
Enduro/X depend on set of the environment variables which define the basic settings for application server to
17+
start to work. These includes various shared memory settings, queue settings, etc. See the ex_env(5) page for that.
18+
19+
The set of environment variables means that users needs to maintain and set them some how. With the common-configuration
20+
framework, these variables can be defined in ini file in '[@global]' section. When the Enduro/X initializes standard library,
21+
it is searching for 'NDRX_CCONFIG' environment variable presence. If the variable is present, Enduro/X loads into memory
22+
sections which are needed for later processing. From these sections settings from [@global] is automatically loaded
23+
as environment variables for current processing, by using system call 'setenv()'. Thus in this section you may define
24+
any environment variables you want to see for process which is started.
25+
26+
== Conclusions
27+
TODO
28+
29+
:numbered!:
30+
31+
[bibliography]
32+
Additional documentation
33+
------------------------
34+
This section lists additional related documents.
35+
36+
[bibliography]
37+
.Resources
38+
- [[[ex_env.5]]] Man page for Enduro/X environment variables.
39+
40+
41+
////////////////////////////////////////////////////////////////
42+
The index is normally left completely empty, it's contents being
43+
generated automatically by the DocBook toolchain.
44+
////////////////////////////////////////////////////////////////

doc/manpage/cconfsrv.adoc

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@ XATMI service calls.
2424

2525
API - get section
2626
-----------------
27-
The server can work in two modes.
2827

29-
1. Get mode ('EX_CC_CMD' UBF buffer set to 'g' (default)). In this mode the request for configuration is made for particular
28+
Get mode ('EX_CC_CMD' UBF buffer set to 'g' (default)). In this mode the request for configuration is made for particular
3029
section. The config files (or directories) for which to do the lookup can be set in 'EX_CC_RESOURCE' field, you may use
3130
multiple occurrences. If field is not set, then lookup is done in all files which are loaded into configuration library. This
3231
includes Enduro/X own config files, which are set in *NDRX_CCONFIG* environment variables (see ex_env(5)). The get request
@@ -95,15 +94,40 @@ It is possible request format verification. The key-format fields are used into
9594

9695
*nX..Y* or *n..Y* (e.g. n2..5, n..3) - Numeric field (can be floating point format). Min length X (measured as string) and max length Y (measured as string).
9796

98-
2. Second mode for configuration server is requesting a config listing. This enters service in conversational mode. The configuration listing mode is requested by setting 'EX_CC_CMD' to 'l'.
97+
API - list sections
98+
-------------------
99+
It is possible to enter in conversational mode in request sections which begins with certain phrase
100+
or it is possible to list all sections for given resources. To enter is list mode you need to call
101+
the configuration server with 'EX_CC_CMD' UBF buffer field set 'l'. If this is the only field
102+
then all sections from default Enduro/X configuration files will be returned.
103+
104+
The sections which starts with phrase can be set in 'EX_CC_LOOKUPSECTION' UBF field occurrences. Resource
105+
to lookup can be specified in 'EX_CC_RESOURCE'.
99106

100107
EXIT STATUS
101108
-----------
102-
*0*::
103-
Success
109+
When error occurs, the configuration service returns *TPESVCFAIL*, and 'EX_NERROR_CODE' is set to corresponding
110+
error code. 'EX_NERROR_MSG' have some additional information about error condition.
111+
112+
*EX_NERROR_CODE* values:
113+
114+
*1* Invalid INI file(s).
115+
116+
*2* Malloc failed (system have low of memory or some kind of other system related problem).
117+
118+
*3* Unix error occurred.
104119

105-
*1*::
106-
Failure
120+
*4* Invalid arguments passed.
121+
122+
*5* System failure.
123+
124+
*6* Mandatory field is missing. 'EX_NERROR_MSG' specifies the exact problematic field.
125+
126+
*7* Field value format error. 'EX_NERROR_MSG' specifies the exact problematic field.
127+
128+
EXAMPLE
129+
-------
130+
See *atmitest/test030_cconfsrv/atmiclt30.c* for sample code.
107131

108132
BUGS
109133
----

0 commit comments

Comments
 (0)