Merge pull request #74 from mnecas/add_ovirt_logrotate_patch

add ovirt logrotate patch

Author: mwperina

misc/packaging/apache/ansible-runner-service.spec

@@ -5,6 +5,7 @@ Version: 1.0.3
 Release: 1%{?dist}
 Summary: RESTful API for ansible/ansible_runner execution
 Source0: https://github.com/ansible/%{name}/archive/%{name}-%{version}.tar.gz
+Patch0:  ovirt_log.patch
 Group:	 Applications/System
 License: ASL 2.0
 
@@ -42,6 +43,7 @@ In addition to the API endpoints, the daemon also provides a /metrics endpoint f
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %build
 # Disable debuginfo packages

misc/packaging/apache/ovirt_log.patch

@@ -0,0 +1,29 @@
+diff --git a/logging.yaml b/logging.yaml
+index 8357727..16a0c1c 100644
+--- a/logging.yaml
++++ b/logging.yaml
+@@ -7,21 +7,13 @@ formatters:
+         format: "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+ 
+ handlers:
+-    console:
+-        class: logging.StreamHandler
+-        level: DEBUG
+-        formatter: simple
+-        stream: ext://sys.stdout
+-
+     file_handler:
+-        class: logging.handlers.RotatingFileHandler
++        class: logging.handlers.WatchedFileHandler
+         level: DEBUG
+         formatter: simple
+-        filename: ansible-runner-service.log
++        filename: /var/log/ovirt-engine/ansible-runner-service.log
+-        maxBytes: 10485760 # 10MB
+-        backupCount: 20
+         encoding: utf8
+ 
+ root:
+     level: DEBUG
+-    handlers: [console, file_handler]
++    handlers: [file_handler]

misc/packaging/logrotate/ansible-runner-service

@@ -1,7 +1,7 @@
 /var/log/ansible-runner-service.log {
-	monthly
+	weekly
 	missingok
 	compress
-	nocreate
-	rotate 1
+	create
+	rotate 4
 }

packaging/gunicorn/ovirt_log.patch

@@ -1,13 +1,29 @@
 diff --git a/logging.yaml b/logging.yaml
-index 8357727..a883306 100644
+index 8357727..16a0c1c 100644
 --- a/logging.yaml
 +++ b/logging.yaml
-@@ -17,7 +17,7 @@ handlers:
-         class: logging.handlers.RotatingFileHandler
+@@ -7,21 +7,13 @@ formatters:
+         format: "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+ 
+ handlers:
+-    console:
+-        class: logging.StreamHandler
+-        level: DEBUG
+-        formatter: simple
+-        stream: ext://sys.stdout
+-
+     file_handler:
+-        class: logging.handlers.RotatingFileHandler
++        class: logging.handlers.WatchedFileHandler
          level: DEBUG
          formatter: simple
 -        filename: ansible-runner-service.log
 +        filename: /var/log/ovirt-engine/ansible-runner-service.log
-         maxBytes: 10485760 # 10MB
-         backupCount: 20
+-        maxBytes: 10485760 # 10MB
+-        backupCount: 20
          encoding: utf8
+ 
+ root:
+     level: DEBUG
+-    handlers: [console, file_handler]
++    handlers: [file_handler]