[msgformats] a couple more tweaks to the query

5 months ago · e0a599b8d3
parent e354fd778e
commit e0a599b8d3
2 changed files with 4 additions and 3 deletions
--- a/src/sql_commands.cc
+++ b/src/sql_commands.cc
@ -190,9 +190,10 @@ SELECT count(*) AS total,
       group_concat(DISTINCT log_format) AS log_formats,
       log_msg_format
    FROM all_logs
+    WHERE log_msg_format != ''
    GROUP BY log_msg_format
    HAVING total > 1
-    ORDER BY total, log_line DESC
+    ORDER BY total DESC, log_line ASC
 )";

    std::string retval;
--- a/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out
+++ b/test/expected/test_sql.sh_d4d540f0ef7e34b693fc72078d1cf2e069f86d81.out
@ -1,4 +1,4 @@
 [1m[4m[7mtotal [0m[1m[4mlog_line [0m[1m[4m       log_time         [0m[1m[4mduration [0m[1m[4mlog_formats [0m[1m[4m                    log_msg_format                      [0m
-[1m[7m    2[0m[7m [0m[7m       2[0m[7m [0m[7m2007-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mRegistering new address record for # on #              [0m 
+[1m[7m    2[0m[7m [0m[7m       0[0m[7m [0m[7m2007-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mNew relevant interface # for #                         [0m 
 [1m[7m    2[0m[7m [0m[7m       1[0m[7m [0m[7m2007-04-28 06:53:55.000[0m[7m [0m[7m        [0m[7m [0m[7msyslog_log [0m[7m [0m[7mJoining # multicast group on interface # with address #[0m 
-[1m[7m    2[0m[1m[7m [0m[1m[7m       0[0m[1m[7m [0m[1m[7m2007-04-28 06:53:55.000[0m[1m[7m [0m[1m[7m        [0m[1m[7m [0m[1m[7msyslog_log [0m[1m[7m [0m[1m[7mNew relevant interface # for #                         [0m[1m [0m
+[1m[7m    2[0m[1m[7m [0m[1m[7m       2[0m[1m[7m [0m[1m[7m2007-04-28 06:53:55.000[0m[1m[7m [0m[1m[7m        [0m[1m[7m [0m[1m[7msyslog_log [0m[1m[7m [0m[1m[7mRegistering new address record for # on #              [0m[1m [0m