webroar 0.2.6 → 0.3.0

data/lib/user_interaction.rb

@@ -20,34 +20,68 @@
 require 'rubygems'
 
 module Webroar
-  module UserInteraction
-    def choose_gem_version
+  class UserInteraction
+
+    def initialize(options)
+      @options = options
+      @gem_name = nil
+    end
+    
+    # User input to install WebROaR
+    def user_input
+      return nil, true, @gem_name if choose_gem_version
+
+      puts "Setting up server admin panel ..."
+
+      username = read_user_name
+      password = read_password
+
+      write_user(username, password)
+
+      puts "Setting up server specifications ..."
+
+      port = read_port
+
+      return port, false, nil
+    end
+
+  private
+
+    def gem_exist?
       print "Checking for any previous installation of WebROaR ... "
       list = Gem.source_index.find_name(/^webroar$/)
 
       unless list
         puts "not found."
-        return nil
+        return false
       end
 
       #gem_names = list.collect {|gem| gem.full_name}
       gem_list = list.collect {|gem| gem.version}
       gem_list.each_with_index do |item, index|
-        if !File.exist?(File.join(WEBROAR_ROOT,"..","webroar-#{item}","conf","config.yml"))
-          gem_list.delete(item)
-        end
+        gem_list.delete(item) if !File.exist?(File.join(WEBROAR_ROOT,"..","webroar-#{item}","conf","config.yml"))
       end
 
       if gem_list.length == 0
         puts "not found."
-        return nil
+        return false
       end
 
       puts "found."
-      gem_name = "WebROaR-" + gem_list[gem_list.length - 1].to_s
+      @gem_name = "WebROaR-" + gem_list[gem_list.length - 1].to_s
+      return true
+    end
+
+    def choose_gem_version
+
+      return false if !@options[:import].nil? and !@options[:import]
+
+      return false unless gem_exist?
+
+      return true if @options[:import]
+
       require File.join(WEBROAR_ROOT, 'src', 'ruby_lib', 'ruby_interface','version.rb')
-      choice_list = ["Import configuration, logs and admin panel data from the previous installation - #{gem_name}.",
-        "No import required, install #{Webroar::SERVER} afresh."]
+      choice_list = ["Import configuration, logs and admin panel data from the previous installation - #{@gem_name}.","No import required, install #{Webroar::SERVER} afresh."]
 
       puts ""
       puts "Please enter your choice from the options below:"
@@ -58,75 +92,103 @@ module Webroar
       print "> "
 
       result = STDIN.gets.chomp("\n")
-      return nil unless result =~ /^\d+$/
+      return false unless result =~ /^\d+$/
       result = result.to_i
-      return gem_name if result == 1
-      return nil
-      
+      return true if result == 1
+      return false
+
       #return nil if result < 1 or (gem_names.length - 1) < result
       #return gem_names[result-1]
     end
-    
-    # User input to install WebROaR
-    def user_input
-      import_from = choose_gem_version
-      return nil, true, import_from if import_from
-      
-      puts "Setting up server admin panel ..."
-      
-      while(true)
-        print "Please enter a username for the administrator account of server's admin panel: "
-        username = STDIN.gets.chomp("\n")
-        if(username.length < 1)
-          #puts "Please enter a username."
-          redo
-        else
-          break
-        end
-      end
-      while(true)
-        print "Please enter a password(minimum 6 characters) for the administrator account of server's admin panel: "
-        system("stty -echo")
-        pswd = STDIN.gets.chomp("\n")
-        if(pswd.length < 6)
-          puts "\nPlease enter a password with at least 6 characters."
-          redo
-        end 
-        print "\nConfirm password: "
-        re_pswd = STDIN.gets.chomp("\n")
-        system("stty echo")
-        print "\n"
-        if(re_pswd  == pswd)
-          write_user(username, pswd)
-          break
-        else
-          puts "\nPasswords do not match. Please try again."
-          redo
+
+
+    def read_user_name
+      if !@options[:username] or @options[:username].length < 1
+        while(true)
+          print "Please enter a username for the administrator account of server's admin panel: "
+          username = STDIN.gets.chomp("\n")
+          if(username.length < 1)
+            #puts "Please enter a username."
+            redo
+          else
+            break
+          end
         end
+        username
+      else
+        @options[:username]
       end
-      puts "Setting up server specifications ..."
-    
-      while(true)
-        print "Enter server port (default is 3000): "
-        port_s = STDIN.gets.chomp
-        if port_s == ""
-          port = 3000
-          break
-        else
-          unless port_s=~/^\d+$/
-            puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
+    end
+
+    def read_password
+      if !@options[:password] or @options[:password].length < 6
+        while(true)
+          puts "\nPlease enter a password with at least 6 characters." if @options[:password]
+          print "Please enter a password(minimum 6 characters) for the administrator account of server's admin panel: "
+          system("stty -echo")
+          pswd = STDIN.gets.chomp("\n")
+          if(pswd.length < 6)
+            puts "\nPlease enter a password with at least 6 characters."
             redo
           end
-          port = port_s.to_i
-          if(port < 1 or port > 65535)
-            puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
-            redo
-          else
+          print "\nConfirm password: "
+          re_pswd = STDIN.gets.chomp("\n")
+          system("stty echo")
+          print "\n"
+          if(re_pswd == pswd)
             break
+          else
+            puts "\nPasswords do not match. Please try again."
+            redo
           end
         end
+        pswd
+      else
+        @options[:password]
       end
-      return port, false, nil
-    end  
-  end
-end
+    end
+
+    def read_port
+      if !@options[:port] or !(@options[:port]=~/^\d+$/) or @options[:port].to_i < 1 or @options[:port].to_i > 65535
+        while(true)
+          puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..." if @options[:port]
+          print "Enter server port (default is 3000): "
+          port_s = STDIN.gets.chomp
+          if port_s == ""
+            port = 3000
+            break
+          else
+            unless port_s=~/^\d+$/
+              puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
+              redo
+            end
+            port = port_s.to_i
+            if(port < 1 or port > 65535)
+              puts "\nInvalid port number. Valid port is a number between 1 and 65535. Please try again ..."
+              redo
+            else
+              break
+            end
+          end
+        end
+        port
+     else
+       @options[:port].to_i
+     end
+    end
+
+    def write_user(username, pswd)
+      info = Array.new
+      u = {}
+      u['user_name'] = username
+      u['password'] = Digest::MD5.hexdigest(pswd)
+      info <<= u
+      yaml_obj=YAML::dump(info)
+      file=File.open(File.join(ADMIN_PANEL_DIR,'config','user.yml'),"w")
+      file.puts(yaml_obj)
+      file.close
+    end
+
+  end #UserInteraction
+
+end #Webroar

data/lib/webroar_command.rb

@@ -16,222 +16,264 @@
 # You should have received a copy of the GNU General Public License
 # along with WebROaR.  If not, see <http://www.gnu.org/licenses/>.
 
+ADMIN_PANEL_ROOT = File.join(WEBROAR_ROOT, 'src', 'admin_panel').freeze
+
+# Basic WebROaR commands
 class WebroarCommand
 
-  def remove_logrotate  # Clear log files
-    if CheckUser.new.check == 0
-      if RUBY_PLATFORM =~ /linux/
-        print "Removing log rotate file ..."
-        file = File.join('','etc','logrotate.d','webroar')
-        if File.exists?(file)
-          File.delete(file)
-        end
-      end
-      if RUBY_PLATFORM =~ /darwin/
-        print "Removing log rotate entry ..."
-        # read file into an array
-        f = File.open("/etc/newsyslog.conf")
-        saved = File.open("tmp.conf", "a")
-        results = f.readlines
-        # Is there a way to remove everything that's been read here?
-        f.close
-
-        results.each do |sending|
-          if !sending.include?"webroar"
-            saved.puts("#{sending}")
-          end
-        end
+  def initialize
+    @server_status = :down
+    @starling_status = :down
+    @analyzer_status = :down
+  end
 
-        # Close the archive file
-        saved.close
+  # Clear log files
+  def clear()
+    return unless CheckUser.check
+    print "Clearing log files ..."
+    log_file_pattern = File.join('','var','log','webroar','*.log')
+    log_files = Dir.glob(log_file_pattern)
+	  log_files.each do |file|
+	    File.truncate(file, 0) if File.exists?(file)
+	  end
+    puts " done."
+  end
 
-        FileUtils.mv("tmp.conf", "/etc/newsyslog.conf")
-      end
+  # Start/Stop/Restart Command
+  def operation(args, op)
+     return unless CheckUser.check
+    (args.nil? or args.length == 1) ? server_operation(op) : application_operation(args, op)
+  end
 
-      puts " done."
+  # Stop and remove the application
+  def remove(args)
+    return unless CheckUser.check
+    if args.length < 2
+      puts "Application name is missing."
+      return
     end
+
+#    gem 'activesupport', '>= 2.3.5'
+#    gem 'activerecord', '>= 2.3.5'
+#    require 'active_record'
+    $LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activerecord', 'lib')}")
+    $LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activesupport', 'lib')}")
+    require File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activerecord', 'lib', 'active_record')
+
+    files = Dir.glob(File.join(ADMIN_PANEL_ROOT, 'app', 'models', "{app,pseudo_model,application_specification,server_specification}.rb"))
+    files << File.join(ADMIN_PANEL_ROOT, 'config','initializers','application_constants.rb')
+    files << File.join(ADMIN_PANEL_ROOT, 'lib','yaml_writer.rb')
+
+    load_files(files)
+
+    reply, err_log = App.stop(args[1])
+    ApplicationSpecification::remove(args[1]) if reply.nil?
+    
+    puts reply ? reply : "Application '#{args[1]}' removed successfully."
+    puts "\n\e[31m" + err_log + "\e[0m" if err_log
+
   end
 
-  def clear(options, args)  # Clear log files
-    if CheckUser.new.check == 0
-      print "Clearing log files ..."
-      log_file_pattern = File.join('','var','log','webroar','*.log')
-      log_files = Dir.glob(log_file_pattern)
-      for file in log_files
-        if File.exists?(file)
-          File.truncate(file, 0)
-        end
-      end
-      puts " done."
+  # Add and start the application
+  def add(options, args)
+    return unless CheckUser.check
+    if args.length < 2
+      puts "Application name is missing."
+      return
+    end
+
+    sockFile = File.join("","tmp","webroar.sock")
+
+    unless File.exist?(sockFile)
+      puts "Either the server is not started or 'webroar.sock' file is deleted."
+      return
+    end
+
+#    gem 'activesupport', '>= 2.3.5'
+#    gem 'activerecord', '>= 2.3.5'
+#    require 'active_record'
+
+    $LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activerecord', 'lib')}")
+    $LOAD_PATH.unshift("#{File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activesupport', 'lib')}")
+    require File.join(ADMIN_PANEL_ROOT,'vendor', 'rails', 'activerecord', 'lib', 'active_record')
+    
+    files = Dir.glob(File.join(ADMIN_PANEL_ROOT, 'app', 'models', "{app,pseudo_model,application_specification,server_specification}.rb"))
+    files << File.join(ADMIN_PANEL_ROOT, 'config','initializers','application_constants.rb')
+    files << File.join(ADMIN_PANEL_ROOT, 'lib','yaml_writer.rb')
+    load_files(files)
+    
+    params = {:app_id => nil,
+      :name => args[1],
+      :host_names => nil,
+      :baseuri => nil,
+      :resolver => options[:resolver],
+      :path => options[:path],
+      :run_as_user => options[:run_as_user],
+      :type1 => options[:type1] ? options[:type1] : 'Rails',
+      :analytics => options[:analytics] ? options[:analytics] : 'Disabled',
+      :environment => options[:environment] ? options[:environment] : 'production',
+      :min_worker => options[:min_worker] ? options[:min_worker] : MIN_WORKERS,
+      :max_worker => options[:max_worker] ? options[:max_worker] : MAX_WORKERS}
+
+    application_specification = ApplicationSpecification.new(params)
+
+    if application_specification.save
+      application_specification.write
+      application_specification.errors.each_full{|msg| puts msg }
+      reply, err_log = App.start(params[:name])
+      #reply = nil indicate success
+      puts reply ? reply : "Application '#{params[:name]}' added successfully."
+      puts "\n\e[31m" + err_log + "\e[0m" if err_log
+      application_specification.remove if (err_log or reply)
+    else
+      application_specification.errors.each_full{|msg| puts msg }
     end
+    
   end
 
-  def start_starling    
-    print "Starting message queue server ..."
-    starling_conf_file = File.join(WEBROAR_ROOT, 'conf', 'starling_server_config.yml')
-    pid_file = YAML.load(File.open(starling_conf_file))["starling"]["pid_file"]
-    pid = File.read(pid_file).chomp.to_i rescue nil    
-    if pid
+  private
+
+  def check_server_status
+    pid = File.read(PIDFILE).chomp.to_i rescue nil
+    unless pid
+      system("#{WEBROAR_BIN_DIR}/webroar-head #{WEBROAR_ROOT}")
+    else
       system("kill -0 #{pid}")
       if $? == 0
         puts " already running."
-        return :running
+        @server_status = :running
+      else
+        system("#{WEBROAR_BIN_DIR}/webroar-head #{WEBROAR_ROOT}")
       end
     end
-    
-    filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-    log_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["log_file"]
-    cmd = "starling -f #{starling_conf_file} >> #{log_file} 2>>#{log_file}"
-    system(cmd)
+  end
+
+  def start_server
+    return true unless @server_status == :down
     if $? == 0
-      puts " done."
-      :up
+      @server_status = :up
+      filename = File.join(WEBROAR_ROOT, 'conf', 'config.yml')
+      apps_spec = YAML.load(File.open(filename))["Application Specification"]
+      sleep_time = (apps_spec ? 1 + apps_spec.size : 1)
+      sleep(sleep_time * 1.5)
+      puts "Head process started successfully."
     else
-      cmd = "starling -f #{starling_conf_file} >> analyzer.log 2>>analyzer.log"
+      puts "An error occurred while starting head process. Please refer '#{WEBROAR_LOG_FILE}' for details."
+      if @starling_status == :up
+        filename = File.join(WEBROAR_ROOT, 'conf', 'starling_server_config.yml')
+        pid_file = YAML.load(File.open(filename))["starling"]["pid_file"]
+        puts "Aborting startup sequence"
+        print "Stopping starling message queue server ..."
+        pid = File.read(pid_file).chomp.to_i rescue nil
+        kill_process(pid)
+      end
+      return false
+    end
+    return true
+  end
+
+  def start_analyzer
+    return if @starling_status == :down
+
+    filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
+    log_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["log_file"]
+
+    print "Starting webroar-analyzer process ..."
+
+    pid_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["pid_file"]
+    pid = File.read(pid_file).chomp.to_i rescue nil
+
+    if pid
+      system("kill -0 #{pid} 2>/dev/null")
+      if $? == 0
+        puts " already running."
+        @analyzer_status = :running
+      end
+    end
+
+    if @analyzer_status == :down
+      cmd = "webroar-analyzer >> #{log_file} 2>>#{log_file}"
       system(cmd)
       if $? == 0
         puts " done."
-        :up
+        @analyzer_status = :up
       else
-        puts " failed."
-        puts "'Analytics' and 'Exception Notification' features would not work. Please refer '#{log_file}' for details."
-        :down
+        # one more try(if /var/log/webroar/ not exists) trying to open analyzer.log in current dir
+        cmd = "webroar-analyzer >> analyzer.log 2>>analyzer.log"
+        system(cmd)
+        if $? == 0
+          puts " done."
+          @analyzer_status = :up
+        else
+          puts " failed."
+          puts "'Analytics' and 'Exception Notification' features would not work. Please refer '#{log_file}' for details."
+          @analyzer_status = :down
+        end
       end
     end
   end
 
+  # Start the server
   def start_webroar
     puts "Initiating WebROaR startup sequence ..."
     if File.exist?(File.join(WEBROAR_BIN_DIR,"webroar-head")) && File.exist?(File.join(WEBROAR_BIN_DIR,"webroar-worker"))
-      starling_status = start_starling
-      server_status = :down
-      puts "Starting webroar-head process ..."
-      pid_file = PIDFILE
-      pid = File.read(pid_file).chomp.to_i rescue nil
-      if !pid
-        system("#{WEBROAR_BIN_DIR}/webroar-head #{WEBROAR_ROOT}")
-      else
-        system("kill -0 #{pid}")
-        if $? == 0
-          puts " already running."
-          server_status = :running
-        else
-          system("#{WEBROAR_BIN_DIR}/webroar-head #{WEBROAR_ROOT}")
-        end
-      end
-      
-      if server_status == :down
-        if $? == 0
-          filename = File.join(WEBROAR_ROOT, 'conf', 'config.yml')
-          apps_spec = YAML.load(File.open(filename))["Application Specification"]
-          sleep_time = 1
-          sleep_time += apps_spec.size if apps_spec
-          sleep(sleep_time*1.5)
-          puts "Head process started successfully."          
-        else
-          puts "An error occurred while starting head process. Please refer '#{WEBROAR_LOG_FILE}' for details."
-          if starling_status == :up
-            filename = File.join(WEBROAR_ROOT, 'conf', 'starling_server_config.yml')
-            pid_file = YAML.load(File.open(filename))["starling"]["pid_file"]
-            puts "Aborting startup sequence"
-            print "Stopping starling message queue server ..."
-            pid = File.read(pid_file).chomp.to_i rescue nil
-            if pid
-              system("kill -INT #{pid} 2>/dev/null")
-              if $? == 0
-                puts " done."
-              else
-                puts " failed."
-              end
-            else
-              puts 'Failed to retrieve pid for the starling message queue server process. Unable to kill it.'
-            end
-          end
-          return
-        end
-      end
-      
-      analyzer_status = :down
-      if starling_status == :up or starling_status == :running
-        filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
-        log_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["log_file"]
-        cmd = "webroar-analyzer >> #{log_file} 2>>#{log_file}"
-        print "Starting webroar-analyzer process ..."        
-        pid_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["pid_file"]
-        pid = File.read(pid_file).chomp.to_i rescue nil
-        if pid
-          system("kill -0 #{pid} 2>/dev/null")
-          if $? == 0
-            puts " already running."
-            analyzer_status = :running            
-          end
-        end
-        if analyzer_status == :down          
-          system(cmd)          
-          if $? == 0
-            puts " done."           
-            analyzer_status = :up            
-          else
-            # one more try(if /var/log/webroar/ not exists) trying to open analyzer.log in current dir
-            cmd = "webroar-analyzer >> analyzer.log 2>>analyzer.log"
-            system(cmd)            
-            if $? == 0
-              puts " done."
-              analyzer_status = :up              
-            else
-              puts " failed."
-              puts "'Analytics' and 'Exception Notification' features would not work. Please refer '#{log_file}' for details."
-              analyzer_status = :down              
-            end
-          end
-        end        
-      end
+      @starling_status = start_starling
       
-      if analyzer_status == :down
+      puts "Starting webroar-head process ..."
+
+      check_server_status
+      return unless start_server
+      start_analyzer
+
+      if @analyzer_status == :down
         puts "Server started but 'Analytics' and 'Exception Notification' features would not work."
-      elsif server_status == :running and analyzer_status == :running 
+      elsif @server_status == :running and @analyzer_status == :running
         puts "Server already running."
       else
         puts "Server started successfully."
       end
-      
     else
       puts "WebROaR is not installed on this machine. Please run *sudo webroar install* to install it."
     end
   end
 
-  def start_application(args)
-    # Start the application
-    count = 1
-    while (count < args.length)
-      ctl = Control.new(args[count])      									
-      begin
-        reply = ctl.add
-        # reply = nil indicate success
-        if reply == nil
-          puts "Application '#{args[count]}' started successfully."
-        else
-          puts reply
-        end
-      rescue Exception => e
-        puts e
-        puts e.backtrace
-        puts "An error occurred while sending 'start' request for the application '#{args[count]}'."
-      end      
-      count += 1
+  # Start starling process
+  def start_starling
+    print "Starting message queue server ..."
+
+    starling_conf_file = File.join(WEBROAR_ROOT, 'conf', 'starling_server_config.yml')
+    pid_file = YAML.load(File.open(starling_conf_file))["starling"]["pid_file"]
+    pid = File.read(pid_file).chomp.to_i rescue nil
+
+    if pid
+      system("kill -0 #{pid}")
+      if $? == 0
+        puts " already running."
+        return :running
+      end
     end
-  end
 
-  def start(options, args)
-    if CheckUser.new.check == 0
-      if args.length == 1
-        start_webroar
+    filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
+    log_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["log_file"]
+
+    system("starling -f #{starling_conf_file} >> #{log_file} 2>>#{log_file}")
+    if $? == 0
+      puts " done."
+      :up
+    else
+      system("starling -f #{starling_conf_file} >> analyzer.log 2>>analyzer.log")
+      if $? == 0
+        puts " done."
+        :up
       else
-        start_application(args)
+        puts " failed."
+        puts "'Analytics' and 'Exception Notification' features would not work. Please refer '#{log_file}' for details."
+        :down
       end
     end
   end
 
+  # Stop the server
   def stop_webroar
     begin
       filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
@@ -240,38 +282,19 @@ class WebroarCommand
         puts "WebROaR is not running."
         return
       end
+
       print 'Stopping webroar-head ...'
-      pid_file = PIDFILE
-      pid = File.read(pid_file).chomp.to_i rescue nil
-      if pid
-        system("kill -INT #{pid} 2>/dev/null")
-        if $? == 0
-          puts " done."
-        else
-          puts " failed."
-        end
-      else
-        puts " failed."
-        puts 'Failed to retrieve pid for the server process. Unable to kill it.'
-      end
+      pid = File.read(PIDFILE).chomp.to_i rescue nil
+      kill_process(pid)
 
       filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
       pid_file = YAML.load(File.open(filename))["webroar_analyzer_script"]["pid_file"]
+
       print "Stopping webroar-analyzer process ..."
       pid = File.read(pid_file).chomp.to_i rescue nil
-      if pid
-        system("kill -INT #{pid} 2>/dev/null")
-        if $? == 0
-          puts " done."
-        else
-          puts " failed."
-          puts "Please refer the log file for details."
-        end
-      else
-        puts " failed."
-        puts 'Failed to retrieve pid for webroar-analyzer process. Unable to kill it.'
-      end
+      kill_process(pid)
       sleep(1)
+
       # Remove all temporary files
       FileUtils.rm Dir.glob('/tmp/webroar_*')
     rescue => err
@@ -280,38 +303,7 @@ class WebroarCommand
     end
   end
 
-  def stop_application(args)
-    count = 1
-    while (count < args.length)
-      ctl = Control.new(args[count])  
-      begin
-        reply = ctl.delete
-        # reply = nil indicate success
-        if reply == nil
-          puts "Application '#{args[count]}' stopped successfully."
-        else
-          puts reply
-        end
-      rescue Exception => e
-        puts e
-        puts e.backtrace
-        puts "An error occurred while sending 'stop' request for the application '#{args[count]}'."
-      end      
-      count += 1
-    end
-  end
-
-  def stop(options, args)
-    if CheckUser.new.check == 0
-      if args == nil or args.length == 1
-        stop_webroar
-      else
-        stop_application(args)
-      end
-    end
-
-  end
-
+  # Restart the server
   def restart_webroar
     puts "Restarting WebROaR ..."
     filename = File.join(WEBROAR_ROOT, 'conf', 'server_internal_config.yml')
@@ -323,35 +315,71 @@ class WebroarCommand
     start_webroar
   end
 
-  def restart_application(args)
-    count = 1
-    while (count < args.length)
-      ctl = Control.new(args[count])      
+  def kill_process(pid)
+    if pid
+      system("kill -INT #{pid} 2>/dev/null")
+      puts $? == 0 ? " done." : " failed."
+    else
+      puts " failed."
+      puts "Failed to retrieve pid. Unable to kill it."
+    end
+  end
+
+  # Load the list of files
+  def load_files(files)
+    unloaded = Array.new
+    files.each do |f|
       begin
-        reply = ctl.restart
-        # reply = nil indicate success
-        if reply == nil
-          puts "Application '#{args[count]}' restarted successfully."
+        require f
+      rescue NameError
+        unloaded << f
+        next
+      end
+    end
+    unloaded.each do |f|
+      require f
+    end
+  end
+
+  # Server start/stop/restart
+  def server_operation(op)
+    case op
+    when 'start'
+      start_webroar
+    when 'stop'
+      stop_webroar
+    when 'restart'
+      restart_webroar
+	  else puts "Operation not supported."
+    end
+  end
+
+  # Application start/stop/restart
+  def application_operation(args, op)
+    (args - args.first(1)).each do |app|
+	  begin
+        case op
+        when 'start'
+          reply, err_log = Control.new(app).add
+          # reply = nil indicate success
+          puts reply ? reply : "Application '#{app}' started successfully."
+        when 'stop'
+          reply, err_log = Control.new(app).delete
+          puts reply ? reply : "Application '#{app}' stopped successfully."
+        when 'restart'
+          reply, err_log = Control.new(app).restart
+          puts reply ? reply : "Application '#{app}' restarted successfully."
         else
-          puts reply
+          return
         end
+
+        puts "\n\e[31m" + err_log + "\e[0m" if err_log
       rescue Exception => e
         puts e
         puts e.backtrace
-        puts "An error occurred while sending 'restart' request for the application '#{args[count]}'."
-      end      
-      count += 1
-    end
-  end
-
-  def restart(options, args)
-    if CheckUser.new.check == 0
-      if args.length == 1
-        restart_webroar
-      else
-        restart_application(args)
+        puts "An error occurred while sending '#{op}' request for the application '#{app}'."
       end
     end
   end
-
+  
 end