infosecn1nja
/
metasploit-framework
mirror of https://github.com/infosecn1nja/metasploit-framework.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Refactor db_{status,connect} a bit
bug/bundler_fix
Nicholas Starke 2015-03-10 13:02:20 -05:00
parent ee8318d5c4 e81f2e366c
commit 4d12690ca6
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/msf/ui/console/command_dispatcher/db.rb
View File

@ -1688,11 +1688,11 @@ class Db
if framework.db.connection_established?
cdb = ""
::ActiveRecord::Base.connection_pool.with_connection { |conn|
if conn.respond_to? :current_database
::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} connected to #{cdb}")
else
print_status("#{framework.db.driver} selected, no connection")
@ -1706,16 +1706,16 @@ class Db
def cmd_db_connect(*args)
return if not db_check_driver
if framework.db.connection_established?
if args[0] != '-h' && framework.db.connection_established?
cdb = ""
::ActiveRecord::Base.connection_pool.with_connection { |conn|
if conn.respond_to? :current_database
::ActiveRecord::Base.connection_pool.with_connection do |conn|
if conn.respond_to?(:current_database)
cdb = conn.current_database
end
}
status = "#{framework.db.driver} already connected to #{cdb}. "
status += "Run db_disconnect first if you wish to connect to a different database."
return print_status(status)
end
print_status("#{framework.db.driver} already connected to #{cdb}. " +
"Run db_disconnect first if you wish to connect to a different database.")
return
end
if (args[0] == "-y")
if (args[1] and not ::File.exists? ::File.expand_path(args[1]))