From 5246efe3d843cbbf42534e0d20cc6b12d97104cc Mon Sep 17 00:00:00 2001 From: Hsing-Wang Liao Date: Sat, 16 Jul 2016 11:05:57 +0800 Subject: [PATCH 1/3] aria2: update init file This update is from #2961, thank @hostkit. Signed-off-by: Hsing-Wang Liao --- net/aria2/Makefile | 2 +- net/aria2/files/aria2.init | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/net/aria2/Makefile b/net/aria2/Makefile index 94e38a3a0f..5e82f15b90 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aria2 PKG_VERSION:=1.24.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/ diff --git a/net/aria2/files/aria2.init b/net/aria2/files/aria2.init index 4205273da0..9d17f4d058 100755 --- a/net/aria2/files/aria2.init +++ b/net/aria2/files/aria2.init @@ -1,5 +1,6 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2014-2016 nanpuyue +# Copyright (C) 2016 kuoruan START=99 SERVICE_WRITE_PID=1 @@ -61,7 +62,7 @@ start_instance() { config_list_foreach "$s" extra_settings append_extrasettings SERVICE_UID="$user" \ - service_start /usr/bin/aria2c --conf-path="$config_file" + service_start /usr/bin/aria2c --conf-path="$config_file" # start service } append_extrasettings() { @@ -69,10 +70,24 @@ append_extrasettings() { } start() { + logger -t ARIA2C 'Starting aria2c service' config_load 'aria2' config_foreach start_instance 'aria2' + return 0 } stop() { - service_stop /usr/bin/aria2c + if [ -n "`pidof aria2c`" ]; then + logger -t ARIA2C 'Shutting down aria2c service' + service_stop /usr/bin/aria2c + fi + return 0 } + +restart() { + logger -t ARIA2C 'Restarting aria2s service' + stop + sleep 2 # give time to shutdown + start +} + From 4b28f01597cebd175ae364bb48adad9936c65ce1 Mon Sep 17 00:00:00 2001 From: Hsing-Wang Liao Date: Sat, 16 Jul 2016 11:07:11 +0800 Subject: [PATCH 2/3] aria2: update to 1.25.0 Signed-off-by: Hsing-Wang Liao --- net/aria2/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/aria2/Makefile b/net/aria2/Makefile index 5e82f15b90..1c70510c62 100644 --- a/net/aria2/Makefile +++ b/net/aria2/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aria2 -PKG_VERSION:=1.24.0 -PKG_RELEASE:=2 +PKG_VERSION:=1.25.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://github.com/aria2/aria2/releases/download/release-$(PKG_VERSION)/ -PKG_MD5SUM:=d8d75cd0ee01c3e50e57214ff552a961 +PKG_MD5SUM:=edc7f20ba182cec30384489fd3dfe135 PKG_INSTALL:=1 PKG_MAINTAINER:=Imre Kaloz , Hsing-Wang Liao From f96c661e27523766b825675219194187f9f47c05 Mon Sep 17 00:00:00 2001 From: Hostkit Date: Sun, 17 Jul 2016 04:46:14 +0700 Subject: [PATCH 3/3] aria2: add log add aria2.log and replace logger -t ARIA2C 'Restarting aria2s service' with logger -t ARIA2C 'Restarting aria2c service' :D :p Signed-off-by: Hsing-Wang Liao --- net/aria2/files/aria2.init | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/net/aria2/files/aria2.init b/net/aria2/files/aria2.init index 9d17f4d058..ab5a0e6b03 100755 --- a/net/aria2/files/aria2.init +++ b/net/aria2/files/aria2.init @@ -42,16 +42,24 @@ start_instance() { config_file="$config_dir/aria2.conf" session_file="$config_dir/aria2.session" dht_file="$config_dir/dht.dat" + log_file="$config_dir/aria2.log" + [ -d "$config_dir" ] || { mkdir -m 0755 -p "$config_dir" touch "$config_file" [ -z "$user" ] || chown -R $user $config_dir } + touch "$session_file" echo -e "enable-rpc=true\nrpc-allow-origin-all=true\nrpc-listen-all=true\nquiet=true" > $config_file echo -e "continue=true\ninput-file=$session_file\nsave-session=$session_file" >> $config_file + option_disabled "$s" 'enable_dht' || echo "dht-file-path=$dht_file" >> $config_file + option_disabled "$s" 'enable_log' || { + touch "$log_file" + echo -e "log=$log_file" >> $config_file + } append_params "$s" \ file_allocation bt_enable_lpd enable_dht rpc_user rpc_passwd rpc_listen_port dir bt_tracker disk_cache \ @@ -85,7 +93,7 @@ stop() { } restart() { - logger -t ARIA2C 'Restarting aria2s service' + logger -t ARIA2C 'Restarting aria2c service' stop sleep 2 # give time to shutdown start