Merge pull request #32 from YunoHost-Apps/testing

Testing

check_process

@@ -17,7 +17,7 @@
 		multi_instance=1
 		incorrect_path=1
 		port_already_use=1
-		change_url=1
+		change_url=0
 ;;; Levels
 	Level 1=auto
 	Level 2=auto

conf/app.src

@@ -1,7 +1,7 @@
 # This is on YunoHost server just to avoid the file from disappearing
 # Original source is https://releases.wekan.team/
-SOURCE_URL=https://build.yunohost.org/apps/wekan-1.07.tar.gz
-SOURCE_SUM=34105938c067b6ebcacaa3e2472061c919eb9e00aaa8e114c0e6b31a89772735
+SOURCE_URL=https://build.yunohost.org/apps/wekan-2.09.tar.gz
+SOURCE_SUM=1956dd19f17d76a6d820a15bcf93a3eb12172f9f5cb1dd40d9925b977e8f930d
 SOURCE_SUM_PRG=sha256sum
 ARCH_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true

scripts/install

@@ -5,6 +5,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 source _future.sh
+source ynh_systemd_action
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -26,9 +27,15 @@ app=$YNH_APP_INSTANCE_NAME
 #=================================================
 # CHECK IF THE APP CAN BE INSTALLED WITH THESE ARGS
 #=================================================
+
+# Check machine architecture (in particular, we don't support ARM and 32bit machines)
+[[ $(uname -m) == "x86_64" ]] || ynh_die "Sorry, but this app can only be installed on a x86, 64 bits machine :("
+
 final_path=/var/www/$app
 test ! -e "$final_path" || ynh_die "This path already contains a folder"
 
+path_url=$(ynh_normalize_url_path $path_url)
+
 # Register (book) web path
 ynh_webpath_register $app $domain $path_url
 
@@ -104,7 +111,7 @@ ynh_print_info "Adding wekan systemd service ..."
 ynh_replace_string "__NODEJS__"   "$nodejs_use_version" "../conf/systemd.service"
 ynh_replace_string "__ENV_PATH__" "$PATH"               "../conf/systemd.service"
 ynh_replace_string "__DB_NAME__"  "$app"                "../conf/systemd.service"
-ynh_replace_string "__URI__"      "$path_url/"          "../conf/systemd.service"
+ynh_replace_string "__URI__"      "$path_url"          "../conf/systemd.service"
 ynh_replace_string "__PORT__"     "$port"               "../conf/systemd.service"
 ynh_replace_string "__DOMAIN__"   "$domain"             "../conf/systemd.service"
 ynh_add_systemd_config
@@ -140,9 +147,12 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-ynh_print_info "Starting wekan ..."
-systemctl restart $app
+
 systemctl reload nginx
 
-ynh_print_info "Waiting for wekan to be up ..."
-sleep 20
+#=================================================
+# START SERVICE
+#=================================================
+
+ynh_systemd_action --action=start --service_name=$app --log_path="systemd" --line_match="Finishing add-custom-html-before-body-end migration"
+sleep 10

scripts/restore

@@ -6,6 +6,7 @@
 # IMPORT GENERIC HELPERS
 #=================================================
 source ../settings/scripts/_future.sh
+source ../settings/scripts/ynh_systemd_action
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -31,10 +32,10 @@ port=$(ynh_app_setting_get $app final_path)
 # CHECK IF THE APP CAN BE RESTORED
 #=================================================
 
-yunohost app checkurl "${domain}${path_url}" -a "$app" \
+ynh_webpath_available $domain $path_url \
 	|| ynh_die "Path not available: ${domain}${path_url}"
 test ! -d $final_path \
-|| ynh_die "There is already a directory: $final_path "
+	|| ynh_die "There is already a directory: $final_path "
 
 #=================================================
 # STANDARD RESTORE STEPS
@@ -52,7 +53,7 @@ ynh_system_user_create $app "$final_path"
 #=================================================
 # INSTALL DEPENDENCIES
 #=================================================
-ynh_install_nodejs 4.8.7
+ynh_install_nodejs 8.9.3
 
 # Install mongodb
 ynh_install_app_dependencies "mongodb mongodb-server"
@@ -63,18 +64,18 @@ ynh_install_app_dependencies "mongodb mongodb-server"
 # Start mogodb
 systemctl enable mongodb
 systemctl start mongodb
-mongorestore --db $app ./dump
+mongorestore --db $app ./dump/$app
 
 #=================================================
 # SPECIFIC SETUP
 #=================================================
 
 # Install wekan dependencies
-chown -R $app $final_path
-pushd $final_path/bundle/programs/server
-ynh_use_nodejs
-npm install
-popd
+#chown -R $app $final_path
+#pushd $final_path/programs/server
+#ynh_use_nodejs
+#npm install
+#popd
 
 #=================================================
 # GENERIC FINALIZATION
@@ -106,5 +107,12 @@ fi
 #=================================================
 # RELOAD NGINX
 #=================================================
-systemctl restart $app
+
 systemctl reload nginx
+
+#=================================================
+# START SERVICE
+#=================================================
+
+ynh_systemd_action --action=start --service_name=$app --log_path="systemd" 
+sleep 10

scripts/upgrade

@@ -7,6 +7,7 @@
 #=================================================
 
 source _future.sh
+source ynh_systemd_action
 source /usr/share/yunohost/helpers
 
 #=================================================
@@ -113,5 +114,12 @@ popd
 #=================================================
 # RELOAD NGINX
 #=================================================
-systemctl restart $app
+
 systemctl reload nginx
+
+#=================================================
+# START SERVICE
+#=================================================
+
+ynh_systemd_action --action=restart --service_name=$app --log_path="systemd" 
+sleep 10

scripts/ynh_systemd_action

@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# Start (or other actions) a service,  print a log in case of failure and optionnaly wait until the service is completely started
+#
+# usage: ynh_systemd_action [-n service_name] [-a action] [ [-l "line to match"] [-p log_path] [-t timeout] [-e length] ]
+# | arg: -n, --service_name= - Name of the service to reload. Default : $app
+# | arg: -a, --action=       - Action to perform with systemctl. Default: start
+# | arg: -l, --line_match=   - Line to match - The line to find in the log to attest the service have finished to boot.
+#                              If not defined it don't wait until the service is completely started.
+# | arg: -p, --log_path=     - Log file - Path to the log file. Default : /var/log/$app/$app.log
+# | arg: -t, --timeout=      - Timeout - The maximum time to wait before ending the watching. Default : 300 seconds.
+# | arg: -e, --length=       - Length of the error log : Default : 20
+ynh_systemd_action() {
+    # Declare an array to define the options of this helper.
+    declare -Ar args_array=( [n]=service_name= [a]=action= [l]=line_match= [p]=log_path= [t]=timeout= [e]=length= )
+    local service_name
+    local action
+    local line_match
+    local length
+    local log_path
+    local timeout
+
+    # Manage arguments with getopts
+    ynh_handle_getopts_args "$@"
+
+    local service_name="${service_name:-$app}"
+    local action=${action:-start}
+    local log_path="${log_path:-/var/log/$service_name/$service_name.log}"
+    local length=${length:-20}
+    local timeout=${timeout:-300}
+
+    # Start to read the log
+    if [[ -n "${line_match:-}" ]]
+    then
+        local templog="$(mktemp)"
+	# Following the starting of the app in its log
+	if [ "$log_path" == "systemd" ] ; then
+            # Read the systemd journal
+            journalctl -u $service_name -f --since=-45 > "$templog" &
+	else
+            # Read the specified log file
+            tail -F -n0 "$log_path" > "$templog" &
+	fi
+        # Get the PID of the tail command
+        local pid_tail=$!
+    fi
+
+    echo "${action^} the service $service_name" >&2
+    systemctl $action $service_name \
+        || ( journalctl --lines=$length -u $service_name >&2 \
+        ; test -n "$log_path" && echo "--" && tail --lines=$length "$log_path" >&2 \
+        ; false )
+
+    # Start the timeout and try to find line_match
+    if [[ -n "${line_match:-}" ]]
+    then
+        local i=0
+        for i in $(seq 1 $timeout)
+        do
+            # Read the log until the sentence is found, that means the app finished to start. Or run until the timeout
+            if grep --quiet "$line_match" "$templog"
+            then
+                echo "The service $service_name has correctly started." >&2
+                break
+            fi
+            echo -n "." >&2
+            sleep 1
+        done
+        if [ $i -eq $timeout ]
+        then
+            echo "The service $service_name didn't fully started before the timeout." >&2
+            journalctl --lines=$length -u $service_name >&2
+            test -n "$log_path" && echo "--" && tail --lines=$length "$log_path" >&2
+        fi
+
+        echo ""
+        ynh_clean_check_starting
+    fi
+}
+
+# Clean temporary process and file used by ynh_check_starting
+# (usually used in ynh_clean_setup scripts)
+#
+# usage: ynh_clean_check_starting
+ynh_clean_check_starting () {
+	# Stop the execution of tail.
+	kill -s 15 $pid_tail 2>&1
+	ynh_secure_remove "$templog" 2>&1
+}