PG-Timeout to chart added
git-svn-id: file:///home/jan/tmp/wetterstation/trunk@75 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
parent
f5a3cc4a67
commit
96007a9077
|
|
@ -102,6 +102,7 @@ int main(int argc, char *argv[]){
|
||||||
DEBUGOUT2(" User: = %s\n",global_opts.pg_user);
|
DEBUGOUT2(" User: = %s\n",global_opts.pg_user);
|
||||||
DEBUGOUT2(" Pass: = %s\n",global_opts.pg_pass);
|
DEBUGOUT2(" Pass: = %s\n",global_opts.pg_pass);
|
||||||
DEBUGOUT2(" Datenbank = %s\n",global_opts.pg_database);
|
DEBUGOUT2(" Datenbank = %s\n",global_opts.pg_database);
|
||||||
|
DEBUGOUT2(" Timeout = %s\n",global_opts.pg_database);
|
||||||
|
|
||||||
if(walk_image_cfg_list())
|
if(walk_image_cfg_list())
|
||||||
wait_for_childs(NULL);
|
wait_for_childs(NULL);
|
||||||
|
|
|
||||||
|
|
@ -31,6 +31,7 @@ typedef struct image_cfg_list_t {
|
||||||
typedef struct config_t {
|
typedef struct config_t {
|
||||||
char *pg_host;
|
char *pg_host;
|
||||||
char *pg_database;
|
char *pg_database;
|
||||||
|
char *pg_timeout;
|
||||||
char *pg_user;
|
char *pg_user;
|
||||||
char *pg_pass;
|
char *pg_pass;
|
||||||
char *image_cfg_location;
|
char *image_cfg_location;
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@ static const config_keyword dflt_keywords[] = {
|
||||||
{"pg_user", read_str, &(global_opts.pg_user), DEFAULT_PG_USER},
|
{"pg_user", read_str, &(global_opts.pg_user), DEFAULT_PG_USER},
|
||||||
{"pg_pass", read_str, &(global_opts.pg_pass), DEFAULT_PG_PASS},
|
{"pg_pass", read_str, &(global_opts.pg_pass), DEFAULT_PG_PASS},
|
||||||
{"pg_database", read_str, &(global_opts.pg_database), DEFAULT_PG_DATABASE},
|
{"pg_database", read_str, &(global_opts.pg_database), DEFAULT_PG_DATABASE},
|
||||||
|
{"pg_timeout", read_str, &(global_opts.pg_timeout), DEFAULT_PG_TIMEOUT},
|
||||||
{"", NULL, NULL, ""}
|
{"", NULL, NULL, ""}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,6 +25,7 @@
|
||||||
#define DEFAULT_PG_USER "localuser" /* Postgres-Username */
|
#define DEFAULT_PG_USER "localuser" /* Postgres-Username */
|
||||||
#define DEFAULT_PG_PASS "" /* Postgres-Passwort */
|
#define DEFAULT_PG_PASS "" /* Postgres-Passwort */
|
||||||
#define DEFAULT_PG_DATABASE "localbase" /* Postgres-Datenbank */
|
#define DEFAULT_PG_DATABASE "localbase" /* Postgres-Datenbank */
|
||||||
|
#define DEFAULT_PG_TIMEOUT "20" /* Postgres-Timeout */
|
||||||
#define DEFAULT_CONFIG_FILE "./chart.conf" /* Standart-Configdatei */
|
#define DEFAULT_CONFIG_FILE "./chart.conf" /* Standart-Configdatei */
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue