Skip to content
This repository has been archived by the owner on May 23, 2024. It is now read-only.

add ovirt logrotate patch #74

Merged
merged 4 commits into from Jul 13, 2020
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions misc/packaging/apache/ansible-runner-service.spec
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
43 changes: 43 additions & 0 deletions misc/packaging/apache/ovirt_log.patch
@@ -0,0 +1,43 @@
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]
diff --git a/misc/packaging/logrotate/ansible-runner-service b/misc/packaging/logrotate/ansible-runner-service
index 8dcf86b..66082b7 100644
--- a/misc/packaging/logrotate/ansible-runner-service
+++ b/misc/packaging/logrotate/ansible-runner-service
@@ -1,7 +1,7 @@
-/var/log/ansible-runner-service.log {
+/var/log/ovirt-engine/ansible-runner-service.log {
monthly
mnecas marked this conversation as resolved.
Show resolved Hide resolved
missingok
compress
- nocreate
+ create
rotate 1
mnecas marked this conversation as resolved.
Show resolved Hide resolved
}
40 changes: 35 additions & 5 deletions packaging/gunicorn/ovirt_log.patch
@@ -1,13 +1,43 @@
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]
diff --git a/misc/packaging/logrotate/ansible-runner-service b/misc/packaging/logrotate/ansible-runner-service
index 8dcf86b..66082b7 100644
--- a/misc/packaging/logrotate/ansible-runner-service
+++ b/misc/packaging/logrotate/ansible-runner-service
@@ -1,7 +1,7 @@
-/var/log/ansible-runner-service.log {
+/var/log/ovirt-engine/ansible-runner-service.log {
monthly
mnecas marked this conversation as resolved.
Show resolved Hide resolved
missingok
compress
- nocreate
+ create
rotate 1
mnecas marked this conversation as resolved.
Show resolved Hide resolved
}