KartikMistry has uploaded a new change for review.
https://gerrit.wikimedia.org/r/230992
Change subject: Log for Apertium
......................................................................
Log for Apertium
Bug: T108797
Change-Id: If6b23c0a468a639ea122b3fcabddf3206aa07390
---
M modules/apertium/manifests/init.pp
M modules/apertium/templates/initscripts/apertium-apy.systemd.erb
M modules/apertium/templates/initscripts/apertium-apy.upstart.erb
A modules/apertium/templates/logrotate.erb
4 files changed, 36 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/92/230992/1
diff --git a/modules/apertium/manifests/init.pp
b/modules/apertium/manifests/init.pp
index 7008178..6d9ac7e 100644
--- a/modules/apertium/manifests/init.pp
+++ b/modules/apertium/manifests/init.pp
@@ -9,9 +9,12 @@
# Number of APY instance processes to run
# [*max_idle_seconds*]
# Seconds to wait before shutdown idle process
+# [*log_dir*]
+# Place where Apertium-APY can put log files.
class apertium(
$num_of_processes = 1,
$max_idle_seconds = 300,
+ $log_dir = '/var/log/apertium',
) {
package { [
'apertium',
@@ -74,4 +77,22 @@
hasrestart => true,
}
}
+
+ $log_file = "${log_dir}/main.log"
+
+ file { $log_dir:
+ ensure => directory,
+ owner => 'apertium',
+ group => 'apertium',
+ mode => '0775',
+ before => Service['apertium-apy'],
+ }
+
+ file { '/etc/logrotate.d/apertium-apy':
+ ensure => present,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ content => template('apertium/logrotate.erb'),
+ }
}
diff --git a/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
b/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
index 8c546db..34993bd 100644
--- a/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
+++ b/modules/apertium/templates/initscripts/apertium-apy.systemd.erb
@@ -12,7 +12,7 @@
LimitNOFILE=8096
# wait 60 seconds for a graceful restart before killing the master
TimeoutStopSec=60
-ExecStart=/usr/bin/python3 /usr/share/apertium-apy/servlet.py -j<%=
@num_of_processes %> -m<%= @max_idle_seconds %> /usr/share/apertium/modes
+ExecStart=/usr/bin/python3 /usr/share/apertium-apy/servlet.py -j<%=
@num_of_processes %> -m<%= @max_idle_seconds %> /usr/share/apertium/modes >>
"<%= @log_file %>" 2>&1
[Install]
WantedBy=multi-user.target
diff --git a/modules/apertium/templates/initscripts/apertium-apy.upstart.erb
b/modules/apertium/templates/initscripts/apertium-apy.upstart.erb
index 9c3b49e..71e5a82 100644
--- a/modules/apertium/templates/initscripts/apertium-apy.upstart.erb
+++ b/modules/apertium/templates/initscripts/apertium-apy.upstart.erb
@@ -16,7 +16,7 @@
env LC_ALL=en_US.utf-8
respawn
-exec /usr/bin/python3 /usr/share/apertium-apy/servlet.py -j<%=
@num_of_processes %> -m<%= @max_idle_seconds %> /usr/share/apertium/modes
+exec /usr/bin/python3 /usr/share/apertium-apy/servlet.py -j<%=
@num_of_processes %> -m<%= @max_idle_seconds %> /usr/share/apertium/modes >>
"<%= @log_file %>" 2>&1
# wait 60 seconds for a graceful restart before killing the master
kill timeout 60
diff --git a/modules/apertium/templates/logrotate.erb
b/modules/apertium/templates/logrotate.erb
new file mode 100644
index 0000000..13649f9
--- /dev/null
+++ b/modules/apertium/templates/logrotate.erb
@@ -0,0 +1,13 @@
+#####################################################################
+### THIS FILE IS MANAGED BY PUPPET
+#####################################################################
+
+<%= @log_dir %>/* {
+ daily
+ copytruncate
+ missingok
+ compress
+ notifempty
+ rotate 15
+ size 256M
+}
--
To view, visit https://gerrit.wikimedia.org/r/230992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If6b23c0a468a639ea122b3fcabddf3206aa07390
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: KartikMistry <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
