psadmin Output Processing

README.md

@@ -113,6 +113,19 @@ Environment variables are used to control `psadmin-plus` and `psadmin` functiona
     * Sets the hook script to run before the `stop` command and after the `start` command.
     * Examples are found in `lib/hooks`.
     * If not set, default is `false` and no hook is triggered.
+* `PS_PSA_OUTPUT`
+    * `all` - the default - shows normal output like past versions
+    * `summary` - only show stdout (plus a few special lines from stderr like "x processes started" but reprocessed into stdout. This will help with Rundeck and other tools to keep stderr from being polluted with informational messages.
+    * `quiet` - hide all output - you can use exit codes from `psa`. On errors, `psa` will display stderr from `psadmin`.
+* `PS_PSA_TIMESTAMP`
+    * `true` - each line will have a timestamp prepended to it - useful with `psa status tux APPDOM` to output the Tuxedo Queue stats to file
+    * `false` - default
+* `PS_PSA_NO_BANNER`
+    * `true` - do not display the command banner - useful with the `PS_PSA_OUTPUT=quiet` option
+    * `false` - default
+* `PS_PSA_DEBUG`
+    * `INFO` - default - only display informational messages
+    * `DEBUG` - display debug output including commands
 
 ## Configuration File
 

bin/psa

@@ -1,25 +1,27 @@
 #!/usr/bin/env ruby
 
 begin
-  require 'psadmin_plus'
+    require 'psadmin_plus'
 rescue LoadError
-  # running directly, not through gem install
-  require_relative '../lib/psadmin_plus.rb'
+    # running directly, not through gem install
+    require_relative '../lib/psadmin_plus.rb'
 end
 
+include PsadminPlus
+
 # options
 opts_c   = ARGV.shift || "help"
 opts_t   = ARGV.shift || "all"
 opts_d   = ARGV.shift || "all"
 # Set remaining arguments as environment variables
 ARGV.each do |arg|
-  if arg.include? "="
-    var = arg.split('=')
-	ENV[var[0]]=var[1]
-    puts "Setting environment variable " + var[0] + "=" + var[1]
-  else
-    # puts "Skip argument, no valid environment variable found."
-  end
+    if arg.include? "="
+        var = arg.split('=')
+        ENV[var[0]]=var[1]
+        puts "Setting environment variable " + var[0] + "=" + var[1]
+    else
+        # puts "Skip argument, no valid environment variable found."
+    end
 end
 
 commands = opts_c.split(',')
@@ -51,14 +53,19 @@ PS_HOOK_POST        = ENV['PS_HOOK_POST'] || "false"
 PS_HOOK_START       = ENV['PS_HOOK_START'] || "false"
 PS_HOOK_STOP        = ENV['PS_HOOK_STOP'] || "false"
 PS_PSA_SUDO         = ENV['PS_PSA_SUDO'] || "on"
-PS_PSADMIN_PATH     = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "cmd /c #{env('PS_HOME')}/appserv"
+PS_PSADMIN_PATH     = "#{OS_CONST}" == "linux" ? "#{env('PS_HOME')}/bin" : "#{ENV['PS_HOME']}/appserv"
 PS_WIN_SERVICES     = ENV['PS_WIN_SERVICES'] || "false"
 PS_TRAIL_SERVICE    = ENV['PS_TRAIL_SERVICE'] || "false"
 PS_MULTI_HOME       = ENV['PS_MULTI_HOME'] || "false"
 PS_MULTI_DELIMIT    = ENV['PS_MULTI_DELIMIT'] || "/"
 PS_MULTI_PREFIX     = ENV['PS_MULTI_PREFIX'].to_i || 0
 PS_PARALLEL_BOOT    = ENV['PS_PARALLEL_BOOT'] || "false"
-PS_PSA_DEBUG        = ENV['PS_PSA_DEBUG']  || "false"
+PS_PSA_DEBUG        = ENV['PS_PSA_DEBUG']  || "INFO"
+PS_PSA_TIMESTAMP    = ENV['PS_PSA_TIMESTAMP'] || "false"
+PS_PSA_OUTPUT       = ENV['PS_PSA_OUTPUT'] || "all" # values are "all", "summary", "quiet"
+PS_PSA_NO_BANNER    = ENV['PS_PSA_NO_BANNER'] || "false"
+OS_JOIN             = "#{OS_CONST}" == "linux" ? "&&" : ";"
+OS_SETENV           = "#{OS_CONST}" == "linux" ? "export " : "$env:"
 
 # validation
 # check runtime user
@@ -68,7 +75,7 @@ if "#{OS_CONST}" == "linux" then
         exit
     end
 else
-    # windows - TODO
+    # nothing
 end
 
 # process
@@ -90,6 +97,8 @@ commands.each do |c|
             case "#{t}"
             when "app"
                 valid_domains = find_apps
+            when "tux"
+                valid_domains = find_apps
             when "pubsub"
                 valid_domains = find_apps # TODO - find only apps with PUBSUB enabled?
             when "prcs"