1 files changed, 50 insertions, 13 deletions

diff --git a/src/conf_mode/syslog.py b/src/conf_mode/syslog.py
index 5dfc6f390..d600146f3 100755
--- a/src/conf_mode/syslog.py
+++ b/src/conf_mode/syslog.py
@@ -30,6 +30,15 @@ from vyos import ConfigError
 configs = '''
 ## generated by syslog.py ##
 ## file based logging
+{% if files['global']['marker'] -%}
+$ModLoad immark
+{% if files['global']['marker-interval'] %}
+$MarkMessagePeriod  {{files['global']['marker-interval']}} 
+{% endif %}
+{% endif -%}
+{% if files['global']['preserver_fqdn'] -%}
+$PreserveFQDN on
+{% endif -%}
 {% for file in files %}
 $outchannel {{file}},{{files[file]['log-file']}},{{files[file]['max-size']}},{{files[file]['action-on-max-size']}}
 {{files[file]['selectors']}} :omfile:${{file}}
@@ -80,10 +89,10 @@ def get_config():
   c.set_level('system syslog')  
 
   config_data = {
-    'files' : {},
+    'files'   : {},
     'console' : {},
-    'hosts' : {},
-    'user'  : {}
+    'hosts'   : {},
+    'user'    : {}
   }
 
   #####
@@ -93,21 +102,28 @@ def get_config():
   config_data['files'].update(
     {
       'global'  : {
-        'log-file' : '/var/log/vyos-rsyslog',
-        'max-size'  : 262144,
+        'log-file'            : '/var/log/messages',
+        'max-size'            : 262144,
         'action-on-max-size'  : '/usr/sbin/logrotate /etc/logrotate.d/vyos-rsyslog',
-        'selectors'  : '*.notice;local7.debug',
-        'max-files' : '5'
+        'selectors'           : '*.notice;local7.debug',
+        'max-files'           : '5',
+        'preserver_fqdn'      : False
       }
     }
   )
 
+  if c.exists('global marker'):
+    config_data['files']['global']['marker'] = True
+    if c.exists('global marker interval'):
+      config_data['files']['global']['marker-interval'] = c.return_value('global marker interval') 
   if c.exists('global facility'):
     config_data['files']['global']['selectors'] = generate_selectors(c, 'global facility')
   if c.exists('global archive size'):
     config_data['files']['global']['max-size'] = int(c.return_value('global archive size'))* 1024
   if c.exists('global archive files'):
     config_data['files']['global']['max-files'] = c.return_value('global archive files')
+  if c.exists('global preserve-fqdn'):
+    config_data['files']['global']['preserver_fqdn'] = True
 
   ###
   # set system syslog file
@@ -215,26 +231,41 @@ def generate_selectors(c, config_node):
     return selectors
 
 def generate(c):
+  if c == None:
+    return None
+
   tmpl = jinja2.Template(configs, trim_blocks=True)
   config_text = tmpl.render(c)
-  #print (config_text)
   with open('/etc/rsyslog.d/vyos-rsyslog.conf', 'w') as f:
     f.write(config_text)
 
   ## eventually write for each file its own logrotate file, since size is defined it shouldn't matter
   tmpl = jinja2.Template(logrotate_configs, trim_blocks=True)
   config_text = tmpl.render(c)
-  #print (config_text)
   with open('/etc/logrotate.d/vyos-rsyslog', 'w') as f:
     f.write(config_text)
 
 def verify(c):
   if c == None:
     return None
+  #
+  # /etc/rsyslog.conf is generated somewhere and copied over the original (exists in /opt/vyatta/etc/rsyslog.conf)
+  # it interferes with the global logging, to make sure we are using a single base, template is enforced here 
+  #
+  if not os.path.islink('/etc/rsyslog.conf'):
+    os.remove('/etc/rsyslog.conf')
+    os.symlink('/usr/share/vyos/templates/rsyslog/rsyslog.conf', '/etc/rsyslog.conf')
+
+  # /var/log/vyos-rsyslog were the old files, we may want to clean those up, but currently there
+  # is a chance that someone still needs it, so I don't automatically remove them 
+
+  if c == None:
+    return None
 
   fac = ['*','auth','authpriv','cron','daemon','kern','lpr','mail','mark','news','protocols','security',\
         'syslog','user','uucp','local0','local1','local2','local3','local4','local5','local6','local7']
   lvl = ['emerg','alert','crit','err','warning','notice','info','debug','*']
+
   for conf in c:
     if c[conf]:
       for item in c[conf]:
@@ -250,10 +281,16 @@ def verify(c):
 def apply(c):
   ### vyatta-log.conf is being generated somewhere
   ### this is just a quick hack to remove the old configfile
-  
-  if os.path.exists('/etc/rsyslog.d/vyatta-log.conf'):
-    os.remove('/etc/rsyslog.d/vyatta-log.conf')
-  os.system("sudo systemctl restart rsyslog >/dev/null")
+
+  if c == None:
+    ### systemd restarts it, using kill
+    #os.system("sudo systemctl stop rsyslog >/dev/null 2>&1")
+    print ("systemd sends messages to rsyslog, rsyslog won't be stopped")
+  else:
+    if os.path.exists('/etc/rsyslog.d/vyatta-log.conf'):
+      os.remove('/etc/rsyslog.d/vyatta-log.conf')
+
+    os.system("sudo systemctl restart rsyslog >/dev/null")
 
 if __name__ == '__main__':
   try: