Merge pull request #466 from CodeNow/SAN-4222-etudes-des-logs

Add some new jazz to logtail

Author: und1sk0

ansible/dock.yml

@@ -11,6 +11,5 @@
 
 - include: charon.yml git_branch="{{ charon_version }}"
 - include: dock-init.yml git_branch="{{ dock_init_version }}"
-- include: filibuster.yml git_branch="{{ filibuster_version }}"
 - include: image-builder.yml git_branch="{{ image_builder_version }}"
 - include: krain.yml git_branch="{{ krain_version }}"

ansible/roles/bash_aliases/tasks/main.yml

@@ -7,13 +7,3 @@
     owner=ubuntu
     group=ubuntu
     mode=0700
-
-- name: copy bash aliases to root
-  tags: [ loggly, bash_aliases ] 
-  become: true
-  template:
-    src=dot_bash_aliases_root.sh.j2
-    dest=/root/.bash_aliases
-    owner=root
-    group=root
-    mode=0700

ansible/roles/bash_aliases/templates/dot_bash_aliases.sh.j2

@@ -1,19 +1,51 @@
 # Follows the logfile for a given app_name interpolating the datetime string into the logpath (/var/log/runnable/YYYY/MM/DD/HH/<app_name>.log)
 # Usage: logtail <app_name>
-function logtail() {
+
+logpath() {
     local app_name="$1"
     local datetime=`date +%Y/%m/%d/%H`
     local app_log_dir="{{ app_log_dir }}"
-    local logfile="${app_log_dir}/${datetime}/${app_name}.log"
-    tail -f ${logfile} | bunyan
+    echo "${app_log_dir}/${datetime}/${app_name}.log"
 }
 
-# Outputs contents of an npm start log for <app_name>, if it exists, into a pager for reading.
-# Usage: npmlog <app_name>
-function npmlog() {
+logtail() {
+    local app_name="$1"
+    tail -f "$(logpath ${app_name})" | bunyan
+}
+
+# Follows the logfile for a given app_name interpolating the datetime string into the logpath (/var/log/runnable/YYYY/MM/DD/HH/<app_name>.log)
+# Usage: lograw <app_name>
+lograw() {
+    local app_name="$1"
+    tail -f "$(logpath ${app_name})"
+}
+
+# Just display the last few lines of a log (2nd arg specifies # of lines or tail default if left blank)
+# Usage: loglast <app_name> [ <#_of_lines> ]
+loglast() {
+    local app_name="$1"
+    local tailopts=""
+    # do not check contents of $2, just if exists, escape jinja2 keyword.
+    if [ 2 -eq "{{ '${#}' }}" ] ; then
+        tailopts="-${2}" 
+    fi
+    tail "${tailopts}" "$(logpath ${app_name})" | bunyan
+}
+
+# Follow a log, grep for "${regexp}"
+# Usage: greplog <app_name> <regexp>
+greplog() {
     local app_name="$1"
-    local app_log_dir="/var/log"
-    local logfile="${app_log_dir}/${app_name}.log"
-    less ${logfile}
+    local regexp=""
+    # again, not checking arg2, just making sure it exists, and espace jinja2 keyword.
+    if [ 2 -eq "{{ '${#}' }}" ] ; then
+        regexp="${2}" 
+    fi
+    tail -f "$(logpath ${app_name})" | grep "${regexp}" | bunyan
 }
 
+# Outputs contents of an npm start log for <app_name>, if it exists, into a pager for reading.
+# Usage: npmlog <app_name>
+npmlog() {
+    less "$(logpath ${app_name})"
+}