Update to execute mused-server automatically in target booting

Change-Id: If8b606563a3b6df50723d5084c873c4c53fc0e8c

diff --git a/include/mmsvc_core_internal.h b/include/mmsvc_core_internal.h
index ad6afaa..cce475e 100644 (file)
--- a/include/mmsvc_core_internal.h
+++ b/include/mmsvc_core_internal.h
@@ -64,8 +64,8 @@ extern "C" {
 #define MUSED_DIR "/var/run/mused"
 #define LOGFILE "/tmp/mmsvc_core_log"
 #define LOCKFILE "/tmp/.mmsvc-core.lock"
-#define SOCKFILE0 "/tmp/mmsvc_core_socket"
-#define SOCKFILE1 "/tmp/mmsvc_core_data_socket"
+#define SOCKFILE0 "/tmp/.mmsvc_core_socket"
+#define SOCKFILE1 "/tmp/.mmsvc_core_data_socket"
 
 #define TIMEOUT        0x01
 /** Wait for a socket or FD to become readable */

diff --git a/packaging/mused.service b/packaging/mused-server.service
similarity index 62%
rename from packaging/mused.service
rename to packaging/mused-server.service
index 7965ede..2b3019c 100644 (file)
--- a/packaging/mused.service
+++ b/packaging/mused-server.service
@@ -1,15 +1,12 @@
 [Unit]
 Description=Mused server
-After=vconf-setup.service
 
 [Service]
-Type=simple
-ExecStart=/usr/bin/mused-server
-Restart=always
-RestartSec=0
-MemoryLimit=100M
 User=system
 Group=system
+Type=oneshot
+ExecStart=/usr/bin/mused-server
+MemoryLimit=10M
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/mused.socket b/packaging/mused-server.socket
similarity index 80%
rename from packaging/mused.socket
rename to packaging/mused-server.socket
index 3c82730..900c392 100644 (file)
--- a/packaging/mused.socket
+++ b/packaging/mused-server.socket
@@ -2,7 +2,7 @@
 SocketUser=system
 SocketGroup=system
 ListenStream=/tmp/.mmsvc_core_socket
-Service=mused.service
+Service=mused-server.service
 
 [Install]
 WantedBy=sockets.target

diff --git a/packaging/mused.spec b/packaging/mused.spec
index 4dcbb5d..f74ed43 100644 (file)
--- a/packaging/mused.spec
+++ b/packaging/mused.spec
@@ -2,11 +2,11 @@ Name:       mused
 Summary:    A Media Daemon library in Tizen Native API
 Version:    0.1.1
 Release:    0
-Group:      Multimedia/Service
+Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
-Source1:    mused.service
-Source2:    mused.socket
+Source1:    mused-server.service
+Source2:    mused-server.socket
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(glib-2.0)
@@ -56,16 +56,16 @@ cp mused-server %{buildroot}/usr/bin
 %make_install
 
 mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/mused.service
-ln -s ../mused.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/mused.service
+install -m 0644 %SOURCE1 %{buildroot}%{_libdir}/systemd/system/mused-server.service
+ln -s ../mused-server.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/mused-server.service
 
 mkdir -p %{buildroot}%{_libdir}/systemd/system/sockets.target.wants
-install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/mused.socket
-ln -s ../mused.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/mused.socket
+install -m 0644 %SOURCE2 %{buildroot}%{_libdir}/systemd/system/mused-server.socket
+ln -s ../mused-server.socket %{buildroot}%{_libdir}/systemd/system/sockets.target.wants/mused-server.socket
 
 %post
 /sbin/ldconfig
-chown 200:200 %{_libdir}/systemd/system/mused.socket
+chown 200:200 %{_libdir}/systemd/system/mused-server.socket
 
 %postun -p /sbin/ldconfig
 
@@ -75,10 +75,10 @@ chown 200:200 %{_libdir}/systemd/system/mused.socket
 %defattr(-,system,system,-)
 %{_libdir}/libmused.so.*
 %{_datadir}/license/%{name}
-%{_libdir}/systemd/system/mused.service
-%{_libdir}/systemd/system/multi-user.target.wants/mused.service
-%{_libdir}/systemd/system/sockets.target.wants/mused.socket
-%{_libdir}/systemd/system/mused.socket
+%{_libdir}/systemd/system/mused-server.service
+%{_libdir}/systemd/system/multi-user.target.wants/mused-server.service
+%{_libdir}/systemd/system/sockets.target.wants/mused-server.socket
+%{_libdir}/systemd/system/mused-server.socket
 %{_datadir}/mused/mused.conf
 /usr/bin/*
 

diff --git a/src/mmsvc_core_config.c b/src/mmsvc_core_config.c
index b128bfb..454d4d4 100644 (file)
--- a/src/mmsvc_core_config.c
+++ b/src/mmsvc_core_config.c
@@ -124,7 +124,6 @@ static int _mmsvc_core_config_parser(void)
                MMSVC_FREE(host_name);
        }
 
-       LOGD("Leave");
        return 0;
 }