File: syslog_log_name.patch

package info (click to toggle)
swift 2.36.0-3
  • links: PTS, VCS
  • area: main
  • in suites: sid
  • size: 23,024 kB
  • sloc: python: 286,182; javascript: 1,059; sh: 619; pascal: 295; makefile: 81; xml: 32
file content (357 lines) | stat: -rw-r--r-- 12,292 bytes parent folder | download | duplicates (3)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
Description: Set log_name for Swift services in default configs
Author: Ondřej Nový <novy@ondrej.org>
Forwarded: not-needed
Last-Update: 2016-07-05

Index: swift/etc/account-server.conf-sample
===================================================================
--- swift.orig/etc/account-server.conf-sample
+++ swift/etc/account-server.conf-sample
@@ -18,7 +18,7 @@ bind_port = 6202
 # max_clients = 1024
 #
 # You can specify default log routing here if you want:
-# log_name = swift
+log_name = swift-account
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -85,7 +85,7 @@ pipeline = healthcheck recon backend_rat
 [app:account-server]
 use = egg:swift#account
 # You can override the default log routing for this app here:
-# set log_name = account-server
+set log_name = swift-account-server
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_requests = true
@@ -150,7 +150,7 @@ use = egg:swift#backend_ratelimit
 
 [account-replicator]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = account-replicator
+log_name = swift-account-replicator
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -237,7 +237,7 @@ use = egg:swift#backend_ratelimit
 
 [account-auditor]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = account-auditor
+log_name = swift-account-auditor
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -262,7 +262,7 @@ use = egg:swift#backend_ratelimit
 
 [account-reaper]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = account-reaper
+log_name = swift-account-reaper
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
Index: swift/etc/container-reconciler.conf-sample
===================================================================
--- swift.orig/etc/container-reconciler.conf-sample
+++ swift/etc/container-reconciler.conf-sample
@@ -3,7 +3,7 @@
 # user = swift
 # ring_check_interval = 15.0
 # You can specify default log routing here if you want:
-# log_name = swift
+log_name = swift-container-reconciler
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
Index: swift/etc/container-server.conf-sample
===================================================================
--- swift.orig/etc/container-server.conf-sample
+++ swift/etc/container-server.conf-sample
@@ -24,7 +24,7 @@ bind_port = 6201
 # allowed_sync_hosts = 127.0.0.1
 #
 # You can specify default log routing here if you want:
-# log_name = swift
+log_name = swift-container
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -91,7 +91,7 @@ pipeline = healthcheck recon backend_rat
 [app:container-server]
 use = egg:swift#container
 # You can override the default log routing for this app here:
-# set log_name = container-server
+set log_name = swift-container-server
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_requests = true
@@ -160,7 +160,7 @@ use = egg:swift#backend_ratelimit
 
 [container-replicator]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = container-replicator
+log_name = swift-container-replicator
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -247,7 +247,7 @@ use = egg:swift#backend_ratelimit
 
 [container-updater]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = container-updater
+log_name = swift-container-updater
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -283,7 +283,7 @@ use = egg:swift#backend_ratelimit
 
 [container-auditor]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = container-auditor
+log_name = swift-container-auditor
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -308,7 +308,7 @@ use = egg:swift#backend_ratelimit
 
 [container-sync]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = container-sync
+log_name = swift-container-sync
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -380,7 +380,7 @@ use = egg:swift#xprofile
 
 [container-sharder]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = container-sharder
+log_name = swift-container-sharder
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
Index: swift/etc/drive-audit.conf-sample
===================================================================
--- swift.orig/etc/drive-audit.conf-sample
+++ swift/etc/drive-audit.conf-sample
@@ -5,7 +5,7 @@
 # device_dir = /srv/node
 #
 # You can specify default log routing here if you want:
-# log_name = drive-audit
+log_name = swift-drive-audit
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
Index: swift/etc/internal-client.conf-sample
===================================================================
--- swift.orig/etc/internal-client.conf-sample
+++ swift/etc/internal-client.conf-sample
@@ -4,7 +4,7 @@
 # You can specify default log routing here if you want:
 # Note: the 'set' syntax is necessary to override the log_name that some
 # daemons specify when instantiating an internal client.
-# set log_name = swift
+set log_name = swift-internal-client
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
Index: swift/etc/object-server.conf-sample
===================================================================
--- swift.orig/etc/object-server.conf-sample
+++ swift/etc/object-server.conf-sample
@@ -30,7 +30,7 @@ bind_port = 6200
 # max_clients = 1024
 #
 # You can specify default log routing here if you want:
-# log_name = swift
+log_name = swift-object
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -120,7 +120,7 @@ pipeline = healthcheck recon backend_rat
 [app:object-server]
 use = egg:swift#object
 # You can override the default log routing for this app here:
-# set log_name = object-server
+set log_name = swift-object-server
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_requests = true
@@ -277,7 +277,7 @@ use = egg:swift#backend_ratelimit
 
 [object-replicator]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = object-replicator
+log_name = swift-object-replicator
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -384,7 +384,7 @@ use = egg:swift#backend_ratelimit
 # in the [object-replicator] section, however these settings apply to the EC
 # reconstructor
 #
-# log_name = object-reconstructor
+log_name = swift-object-reconstructor
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -506,7 +506,7 @@ use = egg:swift#backend_ratelimit
 
 [object-updater]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = object-updater
+log_name = swift-object-updater
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -573,7 +573,7 @@ use = egg:swift#backend_ratelimit
 
 [object-auditor]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = object-auditor
+log_name = swift-object-auditor
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -675,7 +675,7 @@ use = egg:swift#backend_ratelimit
 # internal_client_conf_path = /etc/swift/internal-client.conf
 #
 # You can override the default log routing for this app here (don't use set!):
-# log_name = object-expirer
+log_name = swift-object-expirer
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
@@ -776,7 +776,7 @@ use = egg:swift#xprofile
 
 [object-relinker]
 # You can override the default log routing for this app here (don't use set!):
-# log_name = object-relinker
+log_name = swift-object-relinker
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_address = /dev/log
Index: swift/etc/proxy-server.conf-sample
===================================================================
--- swift.orig/etc/proxy-server.conf-sample
+++ swift/etc/proxy-server.conf-sample
@@ -39,7 +39,7 @@ bind_port = 8080
 #
 #
 # You can specify default log routing here if you want:
-# log_name = swift
+log_name = swift-proxy
 # log_facility = LOG_LOCAL0
 # log_level = INFO
 # log_headers = false
@@ -120,7 +120,7 @@ pipeline = catch_errors gatekeeper healt
 [app:proxy-server]
 use = egg:swift#proxy
 # You can override the default log routing for this app here:
-# set log_name = proxy-server
+set log_name = swift-proxy-server
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_address = /dev/log
@@ -372,7 +372,7 @@ use = egg:swift#proxy
 [filter:tempauth]
 use = egg:swift#tempauth
 # You can override the default log routing for this filter here:
-# set log_name = tempauth
+set log_name = swift-proxy-tempauth
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -680,7 +680,7 @@ use = egg:swift#s3api
 # ratelimit_as_client_error = false
 
 # You can override the default log routing for this filter here:
-# log_name = s3api
+log_name = swift-s3api
 
 [filter:s3token]
 # s3token middleware authenticates with keystone using the s3 credentials
@@ -720,7 +720,7 @@ http_timeout = 10.0
 # keyfile =
 
 # You can override the default log routing for this filter here:
-# log_name = s3token
+log_name = swift-s3token
 
 # Secrets may be cached to reduce latency for the client and load on Keystone.
 # Set this to some number of seconds greater than zero to enable caching.
@@ -748,7 +748,7 @@ use = egg:swift#healthcheck
 [filter:cache]
 use = egg:swift#memcache
 # You can override the default log routing for this filter here:
-# set log_name = cache
+set log_name = swift-proxy-cache
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -781,7 +781,7 @@ use = egg:swift#memcache
 [filter:ratelimit]
 use = egg:swift#ratelimit
 # You can override the default log routing for this filter here:
-# set log_name = ratelimit
+set log_name = swift-proxy-ratelimit
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -838,7 +838,7 @@ use = egg:swift#read_only
 [filter:domain_remap]
 use = egg:swift#domain_remap
 # You can override the default log routing for this filter here:
-# set log_name = domain_remap
+set log_name = swift-proxy-domain_remap
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -873,7 +873,7 @@ use = egg:swift#domain_remap
 [filter:catch_errors]
 use = egg:swift#catch_errors
 # You can override the default log routing for this filter here:
-# set log_name = catch_errors
+set log_name = swift-proxy-catch_errors
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -883,7 +883,7 @@ use = egg:swift#catch_errors
 # Note: this middleware requires python-dnspython
 use = egg:swift#cname_lookup
 # You can override the default log routing for this filter here:
-# set log_name = cname_lookup
+set log_name = swift-proxy-cname_lookup
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -905,7 +905,7 @@ use = egg:swift#cname_lookup
 [filter:staticweb]
 use = egg:swift#staticweb
 # You can override the default log routing for this filter here:
-# set log_name = staticweb
+set log_name = swift-proxy-staticweb
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false
@@ -992,7 +992,7 @@ use = egg:swift#list_endpoints
 [filter:proxy-logging]
 use = egg:swift#proxy_logging
 # If not set, logging directives from [DEFAULT] without "access_" will be used
-# access_log_name = swift
+access_log_name = swift-proxy-proxy-logging
 # access_log_facility = LOG_LOCAL0
 # access_log_level = INFO
 # access_log_address = /dev/log
@@ -1154,7 +1154,7 @@ use = egg:swift#gatekeeper
 # allow_reserved_names_header = false
 #
 # You can override the default log routing for this filter here:
-# set log_name = gatekeeper
+set log_name = swift-proxy-gatekeeper
 # set log_facility = LOG_LOCAL0
 # set log_level = INFO
 # set log_headers = false