From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 13 Nov 2011 22:15:49 +0000 (+0000)
Subject: packages/memcached: use new service functions
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=320c9daeba3ba5f69188ed5095f6bf15043a8167;p=openwrt%2Fsvn-archive%2Farchive.git

packages/memcached: use new service functions

SVN-Revision: 29061
---

diff --git a/net/memcached/Makefile b/net/memcached/Makefile
index 617ede5a6d..acc29409ed 100644
--- a/net/memcached/Makefile
+++ b/net/memcached/Makefile
@@ -1,14 +1,16 @@
 #
+# Copyright (C) 2009-2011 OpenWrt.org
 # Copyright (C) 2009-2010 Thomas Heil <heil@terminal-consulting.de>
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
+#
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=memcached
 PKG_VERSION:=1.2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://memcached.googlecode.com/files
diff --git a/net/memcached/files/memcached.init b/net/memcached/files/memcached.init
index 1ba27d60d5..063bf64725 100644
--- a/net/memcached/files/memcached.init
+++ b/net/memcached/files/memcached.init
@@ -1,24 +1,27 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2010 OpenWrt.org
+# Copyright (C) 2010-2011 OpenWrt.org
+
 START=80
 
-start_service () {
-    local section="$1"
-        config_get user "$section" user
-        config_get maxconn "$section" maxconn
-        config_get listen "$section" listen
-        config_get port "$section" port
-        config_get memory "$section" memory
+start_instance () {
+	local section="$1"
+
+	config_get user "$section" user
+	config_get maxconn "$section" maxconn
+	config_get listen "$section" listen
+	config_get port "$section" port
+	config_get memory "$section" memory
 
-        memcached_args="-d -u ${user:-nobody} -c ${maxconn:-1024} -l ${listen:-0.0.0.0} -p ${port:-11211} -U ${port:-11211} -m ${memory:-64}"
-        memcached $memcached_args >/dev/null 2>&1
+	service_start /usr/bin/memcached -d -u ${user:-nobody} \
+		-c ${maxconn:-1024} -l ${listen:-0.0.0.0} \
+		-p ${port:-11211} -U ${port:-11211} -m ${memory:-64}
 }
 
 start() {
-    config_load "memcached"
-        config_foreach start_service memcached
+	config_load 'memcached'
+	config_foreach start_instance 'memcached'
 }
 
 stop() {
-    killall memcached
+	service_stop /usr/bin/memcached
 }