Refactoring ejabberd_scanlog plugin

More flexible config, making easier to add new log error types.
Should be faster as well.

plugins/ejabberd/ejabberd_scanlog/ejabberd_scanlog

@@ -53,90 +53,74 @@ File.open(LOG_FILE, 'r') do |flog|
 	new_data = flog.read
 end
 
-LABELS = {
+KNOWN_LOG_TYPES = [
-	:wait_for =>                    'EJAB-1482 Crash when waiting for item',
+	# each element is an instance of Array. 1st item: error description, others: text to search log for
-	:ejabberd_odbc_failure =>       'EJAB-1483 ODBC sup failure (wrong PID?)',
+	['EJAB-1482 Crash when waiting for item',
-	:ejabberd_odbc_failure_echo =>  'EJAB-1483 ODBC sup wrong PID failure echo',
+		['wait_for_']],
-	:dns =>                         'DNS failure',
+	['EJAB-1483 ODBC sup failure (wrong PID?)',
-	:database =>                    'Database unavailable/too slow',
+ 		['ejabberd_odbc_sup']],
-	:auth_error =>                  'The auth module returned an error',
+	['EJAB-1483 ODBC sup wrong PID failure echo',
-	:timeout =>                     'State machine terminated: timeout',
+		["mod_pubsub_odbc,'-unsubscribe"]],
-	:mysql_shutdown =>              'MySQL disconnected',
+	['DNS failure',
-	:mysql_refused =>               'Connecting to MySQL: failed',
+		['You should check your DNS configuration']],
-	:hook_timeout =>                'Timeout while running a hook',
+	['Database unavailable/too slow',
-	:sql_transactions_exceeded =>   'SQL transaction restarts exceeded',
+		['Database was not available or too slow']],
-	:unexpected_info =>             'Unexpected info',
+	['State machine terminated: timeout',
-	:other_sql_cmd_timeout =>       'Other sql_cmd timeout',
+		['State machine',
-	:system_ports_limit =>          'System limit hit: ports', # check with length(erlang:ports())., set in ejabberdctl config file
+		'terminating',
-	:system_limit =>                'Other system limit hit', # processes? check with erlang:system_info(process_count)., erlang:system_info(process_limit)., set in ejabberdctl cfg
+		'Reason for',
-	:generic_server_terminating =>  'Generic server terminating',
+		'timeout']],
-	:mnesia_table_shrinked =>       'Mnesia table shrinked',
+	['The auth module returned an error',
-	:admin_access_failed =>         'Admin access failed',
+		['The authentication module',
-	:mysql_sock_timedout =>         'MySQL sock timedout',
+		'returned an error']],
-	:config_error =>                'Configuration error',
+	['MySQL disconnected',
-	:vcard_error =>                 'Strange vCard error (vhost)',
+		['mysql',
-	:mnesia_overload =>             'Mnesia is overloaded',
+		'Received unknown signal, exiting']],
-	:mysql_init_recv_failed =>      'MySQL: init failed recv data',
+	['Connecting to MySQL: failed',
-	:tcp_failed =>                  'TCP Error',
+		['mysql',
-	:UNKNOWN =>                     'Unknown error/warning'
+		'Failed connecting to']],
-}
+	['Timeout while running a hook',
+		['ejabberd_hooks',
+		'timeout']],
+	['SQL transaction restarts exceeded',
+		['SQL transaction restarts exceeded']],
+	['Unexpected info',
+		['nexpected info']],
+	['Other sql_cmd timeout',
+		['sql_cmd']],
+	['System limit hit: ports', # check with length(erlang:ports())., set in ejabberdctl config file
+		['system_limit',
+		'open_port']],
+	['Other system limit hit', # processes? check with erlang:system_info(process_count)., erlang:system_info(process_limit)., set in ejabberdctl cfg
+		['system_limit']],
+	['Generic server terminating',
+		['Generic server',
+		'terminating']],
+	['Mnesia table shrinked',
+		['shrinking table']],
+	['Admin access failed',
+		['Access of',
+		'failed with error']],
+	['MySQL sock timedout',
+		['mysql_',
+		': Socket',
+		'timedout']],
+	['Configuration error',
+		['{badrecord,config}']],
+	['Strange vCard error (vhost)',
+		['error found when trying to get the vCard']],
+	['Mnesia is overloaded',
+		['Mnesia is overloaded']],
+	['MySQL: init failed recv data',
+		['mysql_conn: init failed receiving data']],
+	['TCP Error',
+		['Failed TCP']]
+]
+
 def log_type(text)
-	if text.include? 'ejabberd_odbc_sup'
+	KNOWN_LOG_TYPES.find_index { |entry|
-		:ejabberd_odbc_failure
+		entry[1].all? { |substr| text.include? substr }
-	elsif text.include? "mod_pubsub_odbc,'-unsubscribe"
+	}
-		:ejabberd_odbc_failure_echo
-	elsif text.include? 'You should check your DNS configuration'
-		:dns
-	elsif text.include? 'Database was not available or too slow'
-		:database
-	elsif text.include? 'wait_for_'
-		:wait_for
-	elsif text.include?('State machine') and
-		text.include?('terminating') and
-		text.include?('Reason for') and
-		text.include?('timeout')
-		:timeout
-	elsif text.include?('The authentication module') and
-		text.include?('returned an error')
-		:auth_error
-	elsif text.include?('mysql') and text.include?('Received unknown signal, exiting')
-		:mysql_shutdown
-	elsif text.include?('mysql') and text.include?('Failed connecting to')
-		:mysql_refused
-	elsif text.include?('ejabberd_hooks') and text.include?('timeout')
-		:hook_timeout
-	elsif text.include?('SQL transaction restarts exceeded')
-		:sql_transactions_exceeded
-	elsif text.include?('nexpected info')
-		:unexpected_info
-	elsif text.include?('timeout') and text.include?('sql_cmd')
-		:other_sql_cmd_timeout
-	elsif text.include?('system_limit') and text.include?('open_port')
-		:system_ports_limit
-	elsif text.include?('system_limit')
-		:system_limit
-	elsif text.include?('Generic server') and text.include?('terminating')
-		:generic_server_terminating
-	elsif text.include?('shrinking table')
-		:mnesia_table_shrinked
-	elsif text.include?('Access of') and text.include?('failed with error')
-		:admin_access_failed
-	elsif text.include?('mysql_') and text.include?(': Socket') and text.include?('timedout')
-		:mysql_sock_timedout
-	elsif text.include?('{badrecord,config}')
-		:config_error
-	elsif text.include?('error found when trying to get the vCard')
-		:vcard_error
-	elsif text.include?('Mnesia is overloaded')
-		:mnesia_overload
-	elsif text.include?('mysql_conn: init failed receiving data')
-		:mysql_init_recv_failed
-	elsif text.include?('Failed TCP')
-		:tcp_failed
-	else
-		warn "Cannot parse text: #{text}" if $debug_mode
-		:UNKNOWN
-	end
 end
 
 new_data.split("\n=").each { |report|
@@ -148,6 +132,8 @@ new_data.split("\n=").each { |report|
 	log_info[type] = (log_info[type] || 0) + 1
 	if sub_type = log_type(text)
 		log_info[sub_type] = (log_info[sub_type] || 0) + 1
+	elsif $debug_mode
+		warn "Unparsed log entry #{type}: #{text} at #{time}"
 	end
 }
 
@@ -160,37 +146,19 @@ graph_title Ejabberd Log
 graph_vlabel total
 graph_category ejabberd
 graph_args -l 0
-graph_order #{(LABELS.keys + log_info.keys.select { |k| k.is_a? String }.sort).join(' ')}
 CONFIG
 end
 
-first = true
+(KNOWN_LOG_TYPES + %w(ERROR WARNING INFO DEBUG)).each.with_index { |log_type, index|
-LABELS.each_pair { |type,label|
+	label, index = if log_type.is_a? Array
+					   [log_type.first, index]
+				   else
+					   [log_type, log_type]
+				   end
 	if ARGV.first == 'config'
-		puts "#{type}.label #{label}"
+		puts "T#{index}.label #{label}"
-		puts "#{type}.draw #{
+		puts "T#{index}.draw LINE"
-			if first
-				first = false
-				'AREA'
-			else
-				'STACK'
-			end
-			'LINE'
-		}"
 	else
-		puts "#{type}.value #{log_info[type] or 0}"
+		puts "T#{index}.value #{log_info[index] or 0}"
-	end
-}
-
-log_info.each_pair { |k,value|
-	unless k == :start
-		if k.is_a? String
-			if ARGV.first == 'config'
-				puts "#{k}.label #{k}"
-				puts "#{k}.draw LINE"
-			else
-				puts "#{k}.value #{value}"
-			end
-		end
 	end
 }