refactor

Author: Christopher M. Neill

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/templates/dot_bash_aliases.sh.j2

@@ -1,58 +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"
+}
+
+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>
-function lograw() {
+lograw() {
     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} 
+    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> ]
-function loglast() {
+loglast() {
     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"
     local tailopts=""
     # trusting YOU, the user, not to fsck this up
     if [ 2 -eq ${#} ] ; then
         tailopts="-${2}" 
     fi
-    tail ${tailopts} ${logfile} | bunyan
+    tail ${tailopts} $(logpath ${app_name}) | bunyan
 }
 
 # Follow a log, grep for "${regexp}"
 # Usage: greplog <app_name> <regexp>
-function greplog() {
+greplog() {
     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"
     local regexp=""
     # trusting YOU, the user, not to fsck this up
     if [ 2 -eq ${#} ] ; then
         regexp="${2}" 
     fi
-    tail -f ${logfile} | grep ${regexp} | bunyan
+    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>
-function npmlog() {
-    local app_name="$1"
-    local app_log_dir="/var/log"
-    local logfile="${app_log_dir}/${app_name}.log"
-    less ${logfile}
+npmlog() {
+    less $(logpath ${app_name})
 }

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

@@ -1,58 +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"
+}
+
+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>
-function lograw() {
+lograw() {
     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} 
+    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> ]
-function loglast() {
+loglast() {
     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"
     local tailopts=""
     # trusting YOU, the user, not to fsck this up
     if [ 2 -eq ${#} ] ; then
         tailopts="-${2}" 
     fi
-    tail ${tailopts} ${logfile} | bunyan
+    tail ${tailopts} $(logpath ${app_name}) | bunyan
 }
 
 # Follow a log, grep for "${regexp}"
 # Usage: greplog <app_name> <regexp>
-function greplog() {
+greplog() {
     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"
     local regexp=""
     # trusting YOU, the user, not to fsck this up
     if [ 2 -eq ${#} ] ; then
         regexp="${2}" 
     fi
-    tail -f ${logfile} | grep ${regexp} | bunyan
+    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>
-function npmlog() {
-    local app_name="$1"
-    local app_log_dir="/var/log"
-    local logfile="${app_log_dir}/${app_name}.log"
-    less ${logfile}
+npmlog() {
+    less $(logpath ${app_name})
 }