From db4bb9fe42ec4c32923b40a91bf1cff63230ac23 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Mon, 5 Aug 2013 17:00:19 +0900 Subject: [PATCH] Conf field added Change-Id: I4cb8313ac0e3bf947d6dfd75feab6027ae618680 --- include/conf.h | 2 ++ packaging/com.samsung.data-provider-slave.spec | 2 +- src/conf.c | 12 ++++++++++++ src/main.c | 1 + 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/conf.h b/include/conf.h index 2f80ff1..806b7b9 100644 --- a/include/conf.h +++ b/include/conf.h @@ -49,6 +49,7 @@ struct conf { double slave_ttl; double slave_activate_time; + double slave_relaunch_time; int max_log_line; int max_log_file; @@ -132,6 +133,7 @@ extern int conf_loader(void); #define REPLACE_TAG_APPID g_conf.replace_tag #define SLAVE_TTL g_conf.slave_ttl #define SLAVE_ACTIVATE_TIME g_conf.slave_activate_time +#define SLAVE_RELAUNCH_TIME g_conf.slave_relaunch_time #define MAX_LOG_LINE g_conf.max_log_line #define MAX_LOG_FILE g_conf.max_log_file diff --git a/packaging/com.samsung.data-provider-slave.spec b/packaging/com.samsung.data-provider-slave.spec index ff21eb4..62e7bb1 100644 --- a/packaging/com.samsung.data-provider-slave.spec +++ b/packaging/com.samsung.data-provider-slave.spec @@ -2,7 +2,7 @@ Name: com.samsung.data-provider-slave Summary: Plugin type livebox service provider. -Version: 0.12.6 +Version: 0.12.7 Release: 1 Group: HomeTF/Livebox License: Flora License diff --git a/src/conf.c b/src/conf.c index 9e62d42..750cce1 100644 --- a/src/conf.c +++ b/src/conf.c @@ -58,6 +58,7 @@ HAPI struct conf g_conf = { .slave_ttl = 30.0f, .slave_activate_time = 30.0f, + .slave_relaunch_time = 3.0f, .max_log_line = 1000, .max_log_file = 3, @@ -225,6 +226,13 @@ static void slave_activate_time_handler(char *buffer) DbgPrint("Slave activate time: %lf\n", g_conf.slave_activate_time); } +static void slave_relaunch_time_handler(char *buffer) +{ + if (sscanf(buffer, "%lf", &g_conf.slave_relaunch_time) != 1) + ErrPrint("Failed to parse the slave_relaunch_time\n"); + DbgPrint("Slave relaunch time: %lf\n", g_conf.slave_relaunch_time); +} + static void max_log_line_handler(char *buffer) { if (sscanf(buffer, "%d", &g_conf.max_log_line) != 1) @@ -386,6 +394,10 @@ HAPI int conf_loader(void) .handler = slave_activate_time_handler, }, { + .name = "slave_relaunch_time", + .handler = slave_relaunch_time_handler, + }, + { .name = "max_log_line", .handler = max_log_line_handler, }, diff --git a/src/main.c b/src/main.c index 22600d3..22bbe5d 100644 --- a/src/main.c +++ b/src/main.c @@ -224,6 +224,7 @@ static bool app_create(void *data) */ ret = fault_init(); DbgPrint("Crash recover is initiated: %d\n", ret); + ret = update_monitor_init(); DbgPrint("Content update monitor is initiated: %d\n", ret); -- 2.7.4