From 9b4abd26147c7d4325549eb4bc698f7bce38f4e2 Mon Sep 17 00:00:00 2001
From: Rottler Tamas <tom@bitfit.hu>
Date: Thu, 2 Mar 2023 15:22:10 +0100
Subject: [PATCH] log fix, install.sh fix

---
 ansible-role/tasks/backup.yml                  |  4 ++--
 ...e-routerbackup => ansible-routerbackup-cron |  0
 install.sh                                     | 18 +++++++-----------
 routerbackup                                   |  8 +++++---
 4 files changed, 14 insertions(+), 16 deletions(-)
 rename ansible-routerbackup => ansible-routerbackup-cron (100%)

diff --git a/ansible-role/tasks/backup.yml b/ansible-role/tasks/backup.yml
index d2f13b7..6cd67c4 100644
--- a/ansible-role/tasks/backup.yml
+++ b/ansible-role/tasks/backup.yml
@@ -11,8 +11,8 @@
 - name: backup
   ansible.builtin.command:
     cmd: >
-      {{ routerbackup_bin }}/routerbackup --difflog --diffprint --logfile {{ routerbackup_log }}
-      --backupdir {{ routerbackup_dir }} --type {{ devtype }}
+      {{ routerbackup_bin }}/routerbackup --difflog --diffprint --noerrors
+      --logfile {{ routerbackup_log }} --backupdir {{ routerbackup_dir }} --type {{ devtype }}
       --host {{ inventory_hostname }} --address {{ ansible_host }} --user {{ ansible_user }}
       {% if ansible_private_key_file is defined %} --sshkey {{ ansible_private_key_file }}{% endif %}
       {% if ansible_ssh_pass is defined %} --password {{ ansible_ssh_pass }}{% endif %}
diff --git a/ansible-routerbackup b/ansible-routerbackup-cron
similarity index 100%
rename from ansible-routerbackup
rename to ansible-routerbackup-cron
diff --git a/install.sh b/install.sh
index 334ca4a..0456ebb 100755
--- a/install.sh
+++ b/install.sh
@@ -6,19 +6,15 @@ function run() {
 }
 
 function createlink() {
-    if [[ ! -e $2 ]]; then
-        run ln -sr $1 $2
-    else
-        if [[ -h $2 ]]; then
-            run ln -sfr $1 $2
-        else
-            echo "WARNING: not overwriting $2: is not a symlink!"
-        fi
+    if [[ -e $2/$3 && ! -h $2/$3 ]]; then
+        echo "WARNING: not overwriting $2/$3: is not a symlink!"
+        return
     fi
+    run ln -sfr $1 -t $2 $3
 }
 
-createlink routerbackup.yml /etc/ansible/routerbackup.yml
-createlink ansible-role /etc/ansible/roles/routerbackup
-createlink ansible-routerbackup /etc/ansible/bin/routerbackup
+createlink routerbackup.yml /etc/ansible routerbackup.yml
+createlink ansible-role /etc/ansible/roles routerbackup
+createlink ansible-routerbackup-cron /etc/ansible/bin routerbackup-cron
 
 # vim: set tabstop=4 shiftwidth=4 expandtab smarttab:
diff --git a/routerbackup b/routerbackup
index 9e01cf2..5168e51 100755
--- a/routerbackup
+++ b/routerbackup
@@ -372,7 +372,10 @@ class AsaConfig(Config):
         return False
 
 def setup_logging(hostname, logfile, loglevel):
-    handler = logging.FileHandler(logfile, 'a')
+    if logfile:
+        handler = logging.FileHandler(logfile, 'a')
+    else:
+        handler = logging.StreamHandler()
     fmt = logging.Formatter(
         "{asctime} "+ hostname +"[{process}] {name}|{levelname} {message}",
         style='{')
@@ -390,8 +393,7 @@ def setup_logging(hostname, logfile, loglevel):
 
 def main():
     args = get_args()
-    if args.logfile:
-        setup_logging(args.host, args.logfile, args.loglevel)
+    setup_logging(args.host, args.logfile, args.loglevel)
     try:
         if args.type not in ('routeros', 'ios', 'asa'):
             raise ValueError(f'Invalid devtype: {args.type}')