From 2b526fdbce778b6c55441be71c35b772526c49e4 Mon Sep 17 00:00:00 2001 From: Sung-jae Park Date: Wed, 8 Apr 2015 19:41:46 +0900 Subject: [PATCH] Fix the pkgmgr tag name [model] Redwood,Kiran,B3(Wearable) [binary_type] AP [customer] Docomo/Orange/ATT/Open [issue#] N/A [problem] [cause] [solution] [team] HomeTF [request] [horizontal_expansion] Change-Id: Ic492fc7a1ca7a557237bae251b341f33953bc54b --- packaging/data-provider-master.spec | 29 ++++++++++++++++++----------- pkgmgr_widget/watch/src/service_watchapp.c | 2 +- pkgmgr_widget/widget/src/service_widget.c | 2 +- src/slave_life.c | 7 +++++++ widget-mgr/src/widget-mgr.c | 4 ++++ 5 files changed, 31 insertions(+), 13 deletions(-) diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec index 3d7033c..3812505 100755 --- a/packaging/data-provider-master.spec +++ b/packaging/data-provider-master.spec @@ -148,24 +148,31 @@ fi # This SYSTEM_UID should be updated properly. # In the SPIN, system user id is 1000 SYSTEM_UID=1000 -chown 5000:5000 /opt/usr/share/live_magazine -chmod 750 /opt/usr/share/live_magazine -chown 5000:5000 /opt/usr/share/live_magazine/log +APP_UID=5000 +APP_GID=5000 + +chown ${APP_UID}:${APP_GID} /opt/usr/share/live_magazine +# System tool(widget-mgr) should be able to access this folder. +# So give the "rx" permission to the other group. (750 -> 755) +chmod 755 /opt/usr/share/live_magazine +chown ${APP_UID}:${APP_GID} /opt/usr/share/live_magazine/log chmod 750 /opt/usr/share/live_magazine/log -chown 5000:5000 /opt/usr/share/live_magazine/reader +chown ${APP_UID}:${APP_GID} /opt/usr/share/live_magazine/reader chmod 750 /opt/usr/share/live_magazine/reader -chown 5000:5000 /opt/usr/share/live_magazine/always +chown ${APP_UID}:${APP_GID} /opt/usr/share/live_magazine/always chmod 750 /opt/usr/share/live_magazine/always -chown ${SYSTEM}:5000 /opt/dbspace/.widget.db +chown ${SYSTEM}:${APP_GID} /opt/dbspace/.widget.db chmod 640 /opt/dbspace/.widget.db -chown ${SYSTEM}:5000 /opt/dbspace/.widget.db-journal +chown ${SYSTEM}:${APP_GID} /opt/dbspace/.widget.db-journal chmod 640 /opt/dbspace/.widget.db-journal -vconftool set -t bool "memory/%{name}/started" 0 -i -u 5000 -f -s system::vconf_system -vconftool set -t int "memory/private/%{name}/restart_count" 0 -i -u 5000 -f -s %{name} -vconftool set -t string "db/%{name}/serveraddr" "/opt/usr/share/live_magazine/.client.socket" -i -u 5000 -f -s system::vconf_system + +vconftool set -t bool "memory/%{name}/started" 0 -i -u ${APP_UID} -f -s system::vconf_system +vconftool set -t int "memory/private/%{name}/restart_count" 0 -i -u ${APP_UID} -f -s %{name} +vconftool set -t string "db/%{name}/serveraddr" "/opt/usr/share/live_magazine/.client.socket" -i -u ${APP_UID} -f -s system::vconf_system + /usr/sbin/setcap -q cap_chown,cap_dac_override,cap_dac_read_search,cap_sys_admin,cap_sys_nice,cap_mac_override,cap_mac_admin+ep /usr/bin/data-provider-master + echo "Successfully installed. Please start a daemon again manually" -echo "%{_sysconfdir}/init.d/%{name} start" %files -n %{name} %manifest %{name}.manifest diff --git a/pkgmgr_widget/watch/src/service_watchapp.c b/pkgmgr_widget/watch/src/service_watchapp.c index 22b00ba..fe36772 100644 --- a/pkgmgr_widget/watch/src/service_watchapp.c +++ b/pkgmgr_widget/watch/src/service_watchapp.c @@ -16,7 +16,7 @@ #include "common.h" -#define WATCH_APP_TAG "WATCH_PKGMGR" +#define WATCH_APP_TAG "watch-application" #define EAPI __attribute__((visibility("default"))) static inline int remove_all_watch(const char *appid) diff --git a/pkgmgr_widget/widget/src/service_widget.c b/pkgmgr_widget/widget/src/service_widget.c index a6478ee..48be3ef 100644 --- a/pkgmgr_widget/widget/src/service_widget.c +++ b/pkgmgr_widget/widget/src/service_widget.c @@ -19,7 +19,7 @@ #include "common.h" -#define WIDGET_TAG "WIDGET_PKGMGR" +#define WIDGET_TAG "widget" #define EAPI __attribute__((visibility("default"))) static inline int remove_all_widgets(const char *appid) diff --git a/src/slave_life.c b/src/slave_life.c index b29e712..492b156 100644 --- a/src/slave_life.c +++ b/src/slave_life.c @@ -685,6 +685,7 @@ static Eina_Bool relaunch_timer_cb(void *data) case AUL_R_ECOMM: /**< Comunication Error */ case AUL_R_ETERMINATING: /**< application terminating */ case AUL_R_ECANCELED: /**< Operation canceled */ + case AUL_R_EREJECTED: slave->relaunch_count--; CRITICAL_LOG("Try relaunch again %s (%d), %d\n", slave_name(slave), slave->pid, slave->relaunch_count); @@ -778,6 +779,7 @@ HAPI int slave_activate(struct slave_node *slave) case AUL_R_ETERMINATING: /**< application terminating */ case AUL_R_ECANCELED: /**< Operation canceled */ case AUL_R_ETIMEOUT: /**< Timeout */ + case AUL_R_EREJECTED: CRITICAL_LOG("Try relaunch this soon %s (%d)\n", slave_name(slave), slave->pid); slave->relaunch_timer = ecore_timer_add(WIDGET_CONF_SLAVE_RELAUNCH_TIME, relaunch_timer_cb, slave); if (!slave->relaunch_timer) { @@ -853,6 +855,11 @@ HAPI int slave_activated(struct slave_node *slave) { slave->state = SLAVE_RESUMED; + /** + * Condition for activating TTL Timer + * 1. If the slave is INHOUSE(data-provider-slave) and LIMIT_TO_TTL is true, and SLAVE_TTL is greater than 0.0f + * 2. Service provider is "secured" and SLAVE_TTL is greater than 0.0f + */ if (((WIDGET_IS_INHOUSE(slave_abi(slave)) && WIDGET_CONF_SLAVE_LIMIT_TO_TTL) || slave->secured == 1) && WIDGET_CONF_SLAVE_TTL > 0.0f) { DbgPrint("Slave deactivation timer is added (%s - %lf)\n", slave_name(slave), WIDGET_CONF_SLAVE_TTL); slave->ttl_timer = ecore_timer_add(WIDGET_CONF_SLAVE_TTL, slave_ttl_cb, slave); diff --git a/widget-mgr/src/widget-mgr.c b/widget-mgr/src/widget-mgr.c index 1f31afa..fa765b0 100644 --- a/widget-mgr/src/widget-mgr.c +++ b/widget-mgr/src/widget-mgr.c @@ -715,6 +715,10 @@ static inline int do_stat(const char *cmd) printf("Icon: %s\n", tmp); free(tmp); + tmp = widget_service_get_category(node_name(node)); + printf("Category: %s\n", tmp); + free(tmp); + tmp = widget_service_get_provider_name(node_name(node)); printf("Provider: %s (content:", tmp); free(tmp); -- 2.7.4