From fec29f558646bc10ca4d58959e93effada7f3ea8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalski Date: Tue, 24 Oct 2017 14:32:16 +0200 Subject: [PATCH] Set display-name for WSGI In order to see all the processes named correctly based on their origins we should set display-name so all the WSGI processes are named difrerently from the Apache ones. Change-Id: I123530014c973e7312a18e384a2c0159842bf228 Closes-bug: #1726841 --- manifests/wsgi/apache.pp | 1 + spec/classes/horizon_wsgi_apache_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 689fedab..547937af 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -220,6 +220,7 @@ class horizon::wsgi::apache ( threads => $wsgi_threads, user => $unix_user, group => $unix_group, + display-name => 'horizon', }, wsgi_import_script => $::horizon::params::django_wsgi, wsgi_process_group => $::horizon::params::wsgi_group, diff --git a/spec/classes/horizon_wsgi_apache_spec.rb b/spec/classes/horizon_wsgi_apache_spec.rb index 5f8e1488..840d2486 100644 --- a/spec/classes/horizon_wsgi_apache_spec.rb +++ b/spec/classes/horizon_wsgi_apache_spec.rb @@ -46,7 +46,7 @@ describe 'horizon::wsgi::apache' do 'wsgi_process_group' => platforms_params[:wsgi_group], 'wsgi_daemon_process' => platforms_params[:wsgi_group], 'wsgi_application_group' => '%{GLOBAL}', - 'wsgi_daemon_process_options' => { 'processes' => params[:wsgi_processes], 'threads' => params[:wsgi_threads], 'user' => platforms_params[:unix_user], 'group' => platforms_params[:unix_group] } + 'wsgi_daemon_process_options' => { 'processes' => params[:wsgi_processes], 'threads' => params[:wsgi_threads], 'user' => platforms_params[:unix_user], 'group' => platforms_params[:unix_group], 'display-name' => 'horizon' } ) end end @@ -83,7 +83,7 @@ describe 'horizon::wsgi::apache' do 'wsgi_process_group' => platforms_params[:wsgi_group], 'wsgi_daemon_process' => platforms_params[:wsgi_group], 'wsgi_application_group' => '%{GLOBAL}', - 'wsgi_daemon_process_options' => { 'processes' => params[:wsgi_processes], 'threads' => params[:wsgi_threads], 'user' => platforms_params[:unix_user], 'group' => platforms_params[:unix_group] } + 'wsgi_daemon_process_options' => { 'processes' => params[:wsgi_processes], 'threads' => params[:wsgi_threads], 'user' => platforms_params[:unix_user], 'group' => platforms_params[:unix_group], 'display-name' => 'horizon' } ) end end