garfield/wpscan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#796, do not swallow exit code

Browse Source
This commit is contained in:
Christian Mehlmauer
2015-05-12 21:51:15 +02:00
parent c7b6b25851
commit 50b75354e0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
wpscan.rb
View File

@@ -2,10 +2,11 @@
# encoding: UTF-8 # encoding: UTF-8
$: << '.' $: << '.'
require File.dirname(__FILE__) + '/lib/wpscan/wpscan_helper'
$exit_code = 0 $exit_code = 0
require File.dirname(__FILE__) + '/lib/wpscan/wpscan_helper'
def main def main
# delete old logfile, check if it is a symlink first. # delete old logfile, check if it is a symlink first.
File.delete(LOG_FILE) if File.exist?(LOG_FILE) and !File.symlink?(LOG_FILE) File.delete(LOG_FILE) if File.exist?(LOG_FILE) and !File.symlink?(LOG_FILE)
@@ -412,10 +413,9 @@ def main
puts info("Requests Done: #{@total_requests_done}") puts info("Requests Done: #{@total_requests_done}")
puts info("Memory used: #{used_memory.bytes_to_human}") puts info("Memory used: #{used_memory.bytes_to_human}")
puts info("Elapsed time: #{Time.at(elapsed).utc.strftime('%H:%M:%S')}") puts info("Elapsed time: #{Time.at(elapsed).utc.strftime('%H:%M:%S')}")
exit($exit_code) # must exit!
rescue SystemExit, Interrupt
rescue Interrupt
# do nothing on interrupt
rescue => e rescue => e
puts puts
puts critical(e.message) puts critical(e.message)
@@ -434,3 +434,4 @@ def main
end end
main() main()
exit($exit_code)