Improve error logging when modules fail to load.
* Don't print module file path twice on the same line * Use print_error instead of print * Remove unnecessary newlines git-svn-id: file:///home/svn/framework3/trunk@9358 4d416f70-5f16-0410-b530-b9f4589650daunstable
parent
a6d39ca581
commit
d90656be0e
|
@ -932,8 +932,7 @@ protected
|
||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
errmsg = "#{e.class} #{e}"
|
||||||
errmsg = "#{file}: #{e.class} #{e}"
|
|
||||||
self.module_failed[file] = errmsg
|
self.module_failed[file] = errmsg
|
||||||
elog(errmsg)
|
elog(errmsg)
|
||||||
return false
|
return false
|
||||||
|
|
|
@ -71,7 +71,7 @@ class Auxiliary
|
||||||
omod = self.mod
|
omod = self.mod
|
||||||
self.mod = framework.modules.reload_module(mod)
|
self.mod = framework.modules.reload_module(mod)
|
||||||
if(not self.mod)
|
if(not self.mod)
|
||||||
print_status("Failed to reload module: #{framework.modules.failed[omod.file_path]}")
|
print_error("Failed to reload module: #{framework.modules.failed[omod.file_path]}")
|
||||||
self.mod = omod
|
self.mod = omod
|
||||||
end
|
end
|
||||||
rescue
|
rescue
|
||||||
|
@ -87,7 +87,7 @@ class Auxiliary
|
||||||
omod = self.mod
|
omod = self.mod
|
||||||
self.mod = framework.modules.reload_module(mod)
|
self.mod = framework.modules.reload_module(mod)
|
||||||
if(not self.mod)
|
if(not self.mod)
|
||||||
print_status("Failed to reload module: #{framework.modules.failed[omod.file_path]}")
|
print_error("Failed to reload module: #{framework.modules.failed[omod.file_path]}")
|
||||||
self.mod = omod
|
self.mod = omod
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
|
@ -284,11 +284,10 @@ class Driver < Msf::Ui::Driver
|
||||||
def on_startup
|
def on_startup
|
||||||
# Check for modules that failed to load
|
# Check for modules that failed to load
|
||||||
if (framework.modules.failed.length > 0)
|
if (framework.modules.failed.length > 0)
|
||||||
print("[*] WARNING! The following modules could not be loaded!\n\n")
|
print_error("WARNING! The following modules could not be loaded!")
|
||||||
framework.modules.failed.each_pair do |file, err|
|
framework.modules.failed.each_pair do |file, err|
|
||||||
print("\t#{file}: #{err}\n\n")
|
print_error("\t#{file}: #{err}")
|
||||||
end
|
end
|
||||||
print("\n")
|
|
||||||
end
|
end
|
||||||
framework.events.on_ui_start(Msf::Framework::Revision)
|
framework.events.on_ui_start(Msf::Framework::Revision)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue