Merge pull request #12 from acme-software/redirect_err_to_stdout_upstart

Redirect err to stdout upstart

defaults/main.yml

@@ -102,6 +102,10 @@ deploy_log_stdout: True
 
 deploy_log_stdout_path: "{{ deploy_dir_logs }}/stdout.log"
 
+deploy_log_stderr: True
+
+deploy_log_stderr_path: "{{ deploy_dir_logs }}/stderr.log"
+
 # Service
 ###############################################
 
@@ -117,6 +121,15 @@ deploy_service_start_command: "bin/{{ deploy_app_name }}"
 # PID file location for service installation
 deploy_service_pidfile: "/var/run/{{ deploy_service_name }}.pid"
 
+# If true, use deploy_service_prestop_script to run every time before the service is stopped
+deploy_service_has_preststop_script: False
+
+# Shell script to run if deploy_service_has_prestart_script is true
+deploy_service_preststop_script: ""
+
+# If true, service will start at boot time
+deploy_start_at_boot_time: False
+
 # Which service wrapper / systemloader you want to use
 #
 # This can be default, upstart, systemd or none

templates/service/upstart.conf.j2

@@ -26,6 +26,13 @@ env PIDFILE={{ deploy_service_pidfile }}
 respawn
 respawn limit 3 60
 
+{% if deploy_start_at_boot_time == True %}
+# When to start the service
+start on runlevel [2345]
+# When to stop the service
+stop on runlevel [016]
+{% endif %}
+
 # Change directory to current version of Tankmin
 chdir {{ deploy_dir_app }}
 
@@ -37,4 +44,11 @@ end script
 {% endif %}
 
 # Execute deploy_service_start_command and log stdout
-exec su -c "{{ deploy_service_start_command }} {% if deploy_log_stdout == True %}>>{{ deploy_log_stdout_path }}{% endif %}" {{ deploy_app_user }} -- --pid $PIDFILE
+exec su -c "{{ deploy_service_start_command }} {% if deploy_log_stdout == True %}1>>{{ deploy_log_stdout_path }}{% endif %} {% if deploy_log_stderr == True %}2>>{{ deploy_log_stderr_path }}{% endif %}" {{ deploy_app_user }} -- --pid $PIDFILE
+
+{% if deploy_service_has_prestop_script == True %}
+# Pre-Stop Script
+pre-stop script
+  {{ deploy_service_prestop_script }}
+end script
+{% endif %}