Skip to content

Commit 91c902c

Browse files
sazsaz
committed
fix templates
1 parent dc983c6 commit 91c902c

File tree

4 files changed

+55
-64
lines changed

4 files changed

+55
-64
lines changed

‎templates/client/config.conf.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ $ActionQueueTimeoutEnqueue <%= @spool_timeoutenqueue -%> # time to wait before
88
<% end -%>
99
$ActionQueueType LinkedList # run asynchronously
1010
$ActionResumeRetryCount -1 # infinety retries if host is down
11-
<% if @log_templates and ! @log_templates.empty? -%>
11+
<% if @log_templates and @log_templates.any? -%>
1212

1313
# Define custom logging templates
1414
<% @log_templates.flatten.compact.each do |log_template| -%>
1515
$template <%= log_template['name'] %>,"<%= log_template['template'] %>"
1616
<% end -%>
1717
<% end -%>
18-
<% if @log_filters and ! @log_filters.empty? -%>
18+
<% if @log_filters and @log_filters.any? -%>
1919

2020
# Define custom if/then log conditions
2121
<% @log_filters.each do |log_filter| -%>

‎templates/client/remote.conf.erb

Lines changed: 52 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,55 @@
1-
<% if @remote_servers -%>
2-
<% @remote_servers.flatten.compact.each do |server| -%>
3-
<% if server['pattern'] and server['pattern'] != ''-%>
4-
<% pattern = server['pattern'] -%>
5-
<% else -%>
6-
<% pattern = '*.*' -%>
7-
<% end -%>
8-
<% if server['protocol'] == 'TCP' or server['protocol'] == 'tcp'-%>
9-
<% protocol = '@@' -%>
10-
<% protocol_type = 'TCP' -%>
11-
<% else -%>
12-
<% if server['protocol'] == 'RELP' or server['protocol'] == 'relp'-%>
13-
<% protocol = ':omrelp:' -%>
14-
<% protocol_type = 'RELP' -%>
15-
<% else -%>
16-
<% protocol = '@' -%>
17-
<% protocol_type = 'UDP' -%>
18-
<% end -%>
19-
<% end -%>
20-
<% if server['host'] and server['host'] != ''-%>
21-
<% host = server['host'] -%>
22-
<% else -%>
23-
<% host = 'localhost' -%>
24-
<% end -%>
25-
<% if server['port'] and server['port'] != ''-%>
26-
<% port = server['port'] -%>
27-
<% else -%>
28-
<% if server['protocol'] == 'RELP' or server['protocol'] == 'relp'-%>
29-
<% port = '20514' -%>
30-
<% else -%>
31-
<% port = '514' -%>
32-
<% end -%>
33-
<% end -%>
34-
<% if server['format'] -%>
35-
<% format = ";#{server['format']}" -%>
36-
<% format_type = server['format'] -%>
37-
<% else -%>
38-
<% format = '' -%>
39-
<% format_type = 'the default' -%>
40-
<% end -%>
41-
<% if server['thendrop'] -%>
42-
<% dropaction = '& ~' -%>
43-
<% else -%>
44-
<% dropaction = '' -%>
45-
<% end -%>
46-
# Sending logs that match <%= pattern %> to <%= host %> via <%= protocol_type %> on <%= port %> using <%=format_type %> format.
47-
<%= pattern %> <%= protocol %><%= host %>:<%= port %><%= format %>
48-
<%= dropaction %>
49-
<% end -%>
1+
<% if @remote_servers and @remote_servers.any? -%>
2+
<% @remote_servers.flatten.compact.each do |server| -%>
3+
<% if server['pattern'] and server['pattern'] != ''-%>
4+
<% pattern = server['pattern'] -%>
5+
<% else -%>
6+
<% pattern = '*.*' -%>
7+
<% end -%>
8+
<% if server['protocol'].downcase == 'tcp' -%>
9+
<% protocol = '@@' -%>
10+
<% elsif server['protocol'].downcase == 'relp'-%>
11+
<% protocol = ':omrelp:' -%>
12+
<% else -%>
13+
<% protocol = '@' -%>
14+
<% end -%>
15+
<% if server['host'] and server['host'] != ''-%>
16+
<% host = server['host'] -%>
17+
<% else -%>
18+
<% host = 'localhost' -%>
19+
<% end -%>
20+
<% if server['port'] and server['port'] != ''-%>
21+
<% port = server['port'] -%>
22+
<% else -%>
23+
<% if server['protocol'].downcase == 'relp' -%>
24+
<% port = '20514' -%>
25+
<% else -%>
26+
<% port = '514' -%>
27+
<% end -%>
28+
<% end -%>
29+
<% if server['format'] -%>
30+
<% format = ";#{server['format']}" -%>
31+
<% format_type = server['format'] -%>
32+
<% else -%>
33+
<% format = '' -%>
34+
<% format_type = 'the default' -%>
35+
<% end -%>
36+
<% if server['thendrop'] -%>
37+
<% dropaction = '& ~' -%>
38+
<% else -%>
39+
<% dropaction = '' -%>
40+
<% end -%>
41+
# Sending logs that match <%= pattern %> to <%= host %> via <%= server['protocol'].downcase %> on <%= port %> using <%=format_type %> format.
42+
<%= pattern %> <%= protocol %><%= host %>:<%= port %><%= format %>
43+
<%= dropaction %>
44+
<% end -%>
5045
<% elsif @log_remote -%>
51-
46+
<% if @remote_type == 'tcp' -%>
47+
<% protocol = '@@' -%>
48+
<% elsif @remote_type == 'relp' -%>
49+
<% protocol = ':omrelp:' -%>
50+
<% else -%>
51+
<% protocol = '@' -%>
52+
<% end -%>
5253
# Log to remote syslog server using <%= @remote_type %>
53-
<% if @remote_type == 'tcp' -%>
54-
*.* @@<%= @server -%>:<%= @port -%>;<%= @remote_forward_format -%>
55-
<% else -%>
56-
<% if @remote_type == 'relp' -%>
57-
*.* :omrelp:<%= @server -%>:<%= @port -%>;<%= @remote_forward_format -%>
58-
<% else -%>
59-
*.* @<%= @server -%>:<%= @port -%>;<%= @remote_forward_format -%>
60-
<% end -%>
61-
<% end -%>
54+
*.* <%= protocol -%><%= @server -%>:<%= @port -%>;<%= @remote_forward_format -%>
6255
<% end -%>
63-

‎templates/imfile.erb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
$ModLoad imfile
33
<% end -%>
44

5-
65
$InputFileName <%= @file_name %>
76
$InputFileTag <%= @file_tag %>
87
$InputFileStateFile state-<%= @name.gsub(/[\/ ]/,'-') %>

‎templates/server/_default-header.conf.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $ModLoad imrelp
1818
$RuleSet remote
1919
<% end -%>
2020

21-
<% if @log_templates and ! @log_templates.empty?-%>
21+
<% if @log_templates and @log_templates.any?-%>
2222

2323
# Define custom logging templates
2424
<% @log_templates.flatten.compact.each do |log_template| -%>

0 commit comments

Comments
 (0)