Commit f4e2f3db authored Aug 07, 2012 by Rene Saarsoo

Make all fatal err messages use Logger.fatal.

The old Logger.fatal is now replaced with fatal_backtrace.

parent a95c1996

lib/jsduck/app.rb

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ module JsDuck
		begin
		SourceFile.new(JsDuck::IO.read(fname), fname, @opts)
		rescue
		Logger.instance.fatal("Error while parsing #{fname}", $!)
		Logger.instance.fatal_backtrace("Error while parsing #{fname}", $!)
		exit(1)
		end
		end
		@@ -177,7 +177,7 @@ module JsDuck
		:images => doc_formatter.images
		}
		rescue
		Logger.instance.fatal("Error while formatting #{cls[:name]} #{files}", $!)
		Logger.instance.fatal_backtrace("Error while formatting #{cls[:name]} #{files}", $!)
		exit(1)
		end
		end

lib/jsduck/guides.rb

+1 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ module JsDuck

		return add_toc(guide, @formatter.format(JsDuck::IO.read(guide_file)))
		rescue
		Logger.instance.fatal("Error while reading/formatting guide #{in_dir}", $!)
		Logger.instance.fatal_backtrace("Error while reading/formatting guide #{in_dir}", $!)
		exit(1)
		end
		end

lib/jsduck/js_parser.rb

+2 −1

Original line number	Diff line number	Diff line
		require 'jsduck/esprima'
		require 'jsduck/logger'

		module JsDuck

		@@ -155,7 +156,7 @@ module JsDuck
		properties = NODE_TYPES[node["type"]]

		unless properties
		$stderr.puts "Unknown node type: "+node["type"]
		Logger.instance.fatal("Unknown node type: "+node["type"])
		exit(1)
		end

lib/jsduck/json_duck.rb

+2 −1

Original line number	Diff line number	Diff line
		require 'jsduck/io'
		require 'jsduck/logger'
		require 'json'

		module JsDuck
		@@ -37,7 +38,7 @@ module JsDuck
		begin
		self.parse(JsDuck::IO.read(filename))
		rescue
		$stderr.puts "Oh noes! #{filename} is not a valid JSON file."
		Logger.instance.fatal("#{filename} is not a valid JSON file")
		exit(1)
		end
		end

lib/jsduck/logger.rb

+8 −2

Original line number	Diff line number	Diff line
		@@ -120,8 +120,14 @@ module JsDuck

		# Prints fatal error message with backtrace.
		# The error param should be $! from resque block.
		def fatal(msg, error)
		$stderr.puts "#{paint(:red, msg)}: #{error}"
		def fatal(msg)
		$stderr.puts paint(:red, "Error: ") + msg
		end

		# Prints fatal error message with backtrace.
		# The error param should be $! from resque block.
		def fatal_backtrace(msg, error)
		$stderr.puts paint(:red, "Error: ") + "#{msg}: #{error}"
		$stderr.puts
		$stderr.puts "Here's a full backtrace:"
		$stderr.puts error.backtrace