Fix media-server

 - remove mediasvr file.
 - add service options to media-server.service
   - auto-restart media-server
   - memory limit

Change-Id: I8c6013d0a2a1d2f237fbfdf85879366fa13461aa
Signed-off-by: Minje Ahn <minje.ahn@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index 2539bad..cd69d84 100755 (executable)
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,21 +43,6 @@ COMMON_LDADD += $(STATUS_LIBS)
 pkgconfigdir = $(libdir)/pkgconfig
 dist_pkgconfig_DATA = libmedia-utils.pc
 
-nor_directory = /etc/rc.d/rc3.d
-hib_directory = /etc/rc.d/rc5.d
-
-install-data-hook:
-       mkdir $(DESTDIR)$(nor_directory) -p
-       ln -s ../init.d/mediasvr S46mediasvr
-       mv ./S46mediasvr $(DESTDIR)$(nor_directory)
-       mkdir $(DESTDIR)$(hib_directory) -p
-       ln -s ../init.d/mediasvr S46mediasvr
-       mv ./S46mediasvr $(DESTDIR)$(hib_directory)
-
-# init.d script
-fmsvcdir = /etc/rc.d/init.d
-dist_fmsvc_DATA = ./data/mediasvr
-
 ######################################################
 #libmedia utils
 ######################################################

diff --git a/data/mediasvr b/data/mediasvr
deleted file mode 100755 (executable)
index 893a922..0000000
--- a/data/mediasvr
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-source /etc/tizen-platform.conf
-
-${TZ_SYS_BIN}/media-server&
-

diff --git a/packaging/media-server.service b/packaging/media-server.service
index e243d10..a63af37 100644 (file)
--- a/packaging/media-server.service
+++ b/packaging/media-server.service
@@ -4,6 +4,9 @@ Description=Media server
 [Service]
 Type=simple
 ExecStart=/usr/bin/media-server
+Restart=always
+RestartSec=0
+MemoryLimit=100M
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index b4fec36..5e13f3d 100755 (executable)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.2.78
+Version:    0.2.79
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0
@@ -234,9 +234,6 @@ ln -sf ../media-server-user.path  %{_unitdir_user}/default.target.wants/
 %{_bindir}/media-scanner
 %{_bindir}/media-scanner-v2
 %{_bindir}/mediadb-update
-%exclude %attr(755,-,-) %{_sysconfdir}/rc.d/init.d/mediasvr
-%exclude /etc/rc.d/rc3.d/S46mediasvr
-%exclude /etc/rc.d/rc5.d/S46mediasvr
 %{_unitdir}/media-server.service
 %{_unitdir}/multi-user.target.wants/media-server.service
 %{_unitdir_user}/media-server-user.service