Merge pull request #3 from wvu-r7/pr/4902

Change print_status to print_error
kernelsmith · Mar 10, 2015 · 9a974af · 9a974af
2 parents 4d12690 + 3c7b061
commit 9a974af
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/msf/ui/console/command_dispatcher/db.rb b/lib/msf/ui/console/command_dispatcher/db.rb
@@ -1687,7 +1687,7 @@ def cmd_db_status(*args)
     return if not db_check_driver
 
     if framework.db.connection_established?
-      cdb = ""
+      cdb = ''
       ::ActiveRecord::Base.connection_pool.with_connection do |conn|
         if conn.respond_to?(:current_database)
           cdb = conn.current_database
@@ -1707,14 +1707,14 @@ def cmd_db_connect_help
   def cmd_db_connect(*args)
     return if not db_check_driver
     if args[0] != '-h' && framework.db.connection_established?
-      cdb = ""
+      cdb = ''
       ::ActiveRecord::Base.connection_pool.with_connection do |conn|
         if conn.respond_to?(:current_database)
           cdb = conn.current_database
         end
       end
-      print_status("#{framework.db.driver} already connected to #{cdb}. " +
-        "Run db_disconnect first if you wish to connect to a different database.")
+      print_error("#{framework.db.driver} already connected to #{cdb}")
+      print_error('Run db_disconnect first if you wish to connect to a different database')
       return
     end
     if (args[0] == "-y")