From 30f50dcb0fc06d3063e5f69977ff8f5b70cc1f9f Mon Sep 17 00:00:00 2001
From: colin <colin@git@nixc.us>
Date: Sat, 28 Sep 2024 12:06:55 -0400
Subject: [PATCH] Update pull-logs.sh

---
 pull-logs.sh | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/pull-logs.sh b/pull-logs.sh
index 0a0eccb..46d570c 100644
--- a/pull-logs.sh
+++ b/pull-logs.sh
@@ -37,7 +37,6 @@ get_var_log_logs() {
         if [[ -f $log ]]; then
             echo "Logs from $log"
             awk -v start="$START" -v end="$END" '{
-                # Extract date and time from each line depending on log format
                 logtime = $1 " " $2 " " $3
                 logtime_epoch = mktime(gensub(/-|:/, " ", "g", logtime))
                 start_epoch = mktime(gensub(/-|:/, " ", "g", start))
@@ -56,16 +55,27 @@ get_var_log_logs() {
 get_service_logs() {
     echo "----- Service Logs (nginx, apache, mysql, etc.) -----"
     
-    # Add specific service logs as needed
     service_logs=(/var/log/nginx/access.log /var/log/nginx/error.log /var/log/apache2/access.log /var/log/mysql/error.log)
     
     for log in "${service_logs[@]}"; do
         if [[ -f $log ]]; then
             echo "Logs from $log"
             awk -v start="$START" -v end="$END" '{
-                # Similar to /var/log, but make adjustments if needed for service-specific formats
                 logtime = $1 " " $2
                 logtime_epoch = mktime(gensub(/-|:/, " ", "g", logtime))
                 start_epoch = mktime(gensub(/-|:/, " ", "g", start))
                 end_epoch = mktime(gensub(/-|:/, " ", "g", end))
-                if (logtime_epoch >= start_ep
+                if (logtime_epoch >= start_epoch && logtime_epoch <= end_epoch) {
+                    print $0
+                }
+            }' $log
+        else
+            echo "$log not found, skipping..."
+        fi
+    done
+}
+
+# Fetch logs
+get_journalctl_logs
+get_var_log_logs
+get_service_logs