diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-13 11:03:45 +0100 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2010-12-13 11:03:45 +0100 |
| commit | a072dac3638c399303b3308dbb1c5bbdfc59022b (patch) | |
| tree | b03b8e7a2fd78aa64abd7ec3bc6819b043577812 /runtime/rsyslog.h | |
| parent | 1cd51a5d5a8a2c662e9ebcdea12b2ae01afd34d3 (diff) | |
| parent | 925b060b2932a7f9ddee1e0fcbaa6266ba03d8b1 (diff) | |
| download | rsyslog-a072dac3638c399303b3308dbb1c5bbdfc59022b.tar.gz rsyslog-a072dac3638c399303b3308dbb1c5bbdfc59022b.tar.bz2 rsyslog-a072dac3638c399303b3308dbb1c5bbdfc59022b.zip | |
Merge branch 'lognorm' + some doc added
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/rsyslog.h')
| -rw-r--r-- | runtime/rsyslog.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/rsyslog.h b/runtime/rsyslog.h index c2f6463c..17b20de2 100644 --- a/runtime/rsyslog.h +++ b/runtime/rsyslog.h @@ -136,6 +136,8 @@ typedef uintTiny propid_t; #define PROP_SYS_QHOUR 156 #define PROP_SYS_MINUTE 157 #define PROP_SYS_MYHOSTNAME 158 +#define PROP_CEE 200 +#define PROP_CEE_ALL_JSON 201 /* The error codes below are orginally "borrowed" from @@ -346,6 +348,9 @@ enum rsRetVal_ /** return value. All methods return this if not specified oth RS_RET_FILE_NOT_SPECIFIED = -2180, /**< file name not configured where this was required */ RS_RET_INVLD_CONF_OBJ= -2200, /**< invalid config object (e.g. $Begin conf statement) */ + RS_RET_ERR_LIBEE_INIT = -2201, /**< cannot obtain libee ctx */ + RS_RET_ERR_LIBLOGNORM_INIT = -2202,/**< cannot obtain liblognorm ctx */ + RS_RET_ERR_LIBLOGNORM_SAMPDB_LOAD = -2203,/**< liblognorm sampledb load failed */ /* RainerScript error messages (range 1000.. 1999) */ RS_RET_SYSVAR_NOT_FOUND = 1001, /**< system variable could not be found (maybe misspelled) */ |