Revert "boost muse-server for PNP mode at tv profile"

This reverts commit 1367e80438dc6e9b591e17399b948fb46741a530.

Change-Id: Ib4c8ab9fd591a39883f4994d0aab617aa9874603

diff --git a/packaging/muse-server-vd_product_tv.path b/packaging/muse-server-vd_product_tv.path
index 8f3815a..fdadb48 100644 (file)
--- a/packaging/muse-server-vd_product_tv.path
+++ b/packaging/muse-server-vd_product_tv.path
@@ -3,5 +3,5 @@ Description=muse server
 DefaultDependencies=no
 
 [Path]
-PathExists=/tmp/PNP_mode
+PathExists=/tmp/tvplus_ready
 

diff --git a/packaging/muse-server-vd_product_tv.service b/packaging/muse-server-vd_product_tv.service
index 67db416..e8c1e8c 100644 (file)
--- a/packaging/muse-server-vd_product_tv.service
+++ b/packaging/muse-server-vd_product_tv.service
@@ -1,9 +1,6 @@
 [Unit]
 Description=muse server of vd product (tv)
 ConditionPathExists=!/run/.standalone
-DefaultDependencies=no
-Requires=tizen-system-env.service
-After=tizen-system-env.service
 
 [Service]
 Type=forking
@@ -22,4 +19,4 @@ Capabilities=cap_dac_override=i
 SecureBits=keep-caps
 
 [Install]
-WantedBy=starter.target
+WantedBy=basic.target

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 44782cf..b7cd5fd 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -1,6 +1,6 @@
 Name:       mused
 Summary:    A multimedia daemon
-Version:    0.3.165
+Version:    0.3.164
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
@@ -99,15 +99,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/notstrip
 install -m 0644 %SOURCE6 %{buildroot}%{_sysconfdir}/notstrip/%{name}.notstrip
 %else
 %if ("%{_vd_cfg_product_type}" == "TV") || ("%{_vd_cfg_product_type}" == "LFD") || ("%{_vd_cfg_product_type}" == "HTV") || ("%{_vd_cfg_product_type}" == "AV") || ("%{_vd_cfg_product_type}" == "IWB") || ("%{_vd_cfg_product_type}" == "WALL")
-mkdir -p %{buildroot}%{_unitdir}/starter.target.wants
+mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
 install -m 0644 %SOURCE4 %{buildroot}%{_unitdir}/muse-server.service
-%install_service starter.target.wants muse-server.service
+%install_service basic.target.wants muse-server.service
 
 mkdir -p %{buildroot}%{_sysconfdir}/notstrip
 install -m 0644 %SOURCE6 %{buildroot}%{_sysconfdir}/notstrip/%{name}.notstrip
-mkdir -p %{buildroot}%{_unitdir}/sysinit.target.wants
 install -m 0644 %SOURCE3 %{buildroot}%{_unitdir}/muse-server.path
-%install_service sysinit.target.wants muse-server.path
 %else
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/muse-server.service
@@ -145,8 +143,7 @@ chsmack -a "System::Shared" /var/log/%{name}
 %{_unitdir}/starter.target.wants/muse-server.service
 %else
 %if ("%{_vd_cfg_product_type}" == "TV") || ("%{_vd_cfg_product_type}" == "LFD") || ("%{_vd_cfg_product_type}" == "HTV") || ("%{_vd_cfg_product_type}" == "AV") || ("%{_vd_cfg_product_type}" == "IWB") || ("%{_vd_cfg_product_type}" == "WALL")
-%{_unitdir}/starter.target.wants/muse-server.service
-%{_unitdir}/sysinit.target.wants/muse-server.path
+%{_unitdir}/basic.target.wants/muse-server.service
 %else
 %{_unitdir}/multi-user.target.wants/muse-server.service
 %{_unitdir}/paths.target.wants/muse-server.path

diff --git a/server/src/muse_server_system.c b/server/src/muse_server_system.c
index bb88252..4618efd 100644 (file)
--- a/server/src/muse_server_system.c
+++ b/server/src/muse_server_system.c
@@ -331,7 +331,7 @@ static gboolean _ms_system_cpu_usage_cb(gpointer user_data)
        system->st.idle += i;
 
        if (u + n + s + i == 0) {
-               LOGW("[#%d] cpu usage is 0%%", system->st.counter);
+               LOGD("[#%d] cpu usage is 0%%", system->st.counter);
                return G_SOURCE_REMOVE;
        }
 
@@ -339,7 +339,7 @@ static gboolean _ms_system_cpu_usage_cb(gpointer user_data)
        LOGD("[#%d] cpu usage %d %%", system->st.counter, system->st.usage);
 
        if (system->st.usage < cpu_threshold) {
-               LOGI("[#%d] cpu usage (%d) < cpu_threshold (%d)", system->st.counter, system->st.usage, cpu_threshold);
+               LOGD("[#%d] cpu usage (%d) < cpu_threshold (%d)", system->st.counter, system->st.usage, cpu_threshold);
                return G_SOURCE_REMOVE;
        }