From f71067b0243d1b21786c1c524406e48ecb773c77 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mike.jumper@guac-dev.org>
Date: Sat, 8 Nov 2014 20:19:12 -0800
Subject: [PATCH] GUAC-911: Reduce available log levels to ERROR, WARNING,
 INFO, and DEBUG.

---
 src/guacd/log.c                      | 24 -------------------
 src/libguac/client-handlers.c        |  2 +-
 src/libguac/guacamole/client-types.h | 35 ++++++----------------------
 3 files changed, 8 insertions(+), 53 deletions(-)

diff --git a/src/guacd/log.c b/src/guacd/log.c
index c7169335..adaf7401 100644
--- a/src/guacd/log.c
+++ b/src/guacd/log.c
@@ -46,24 +46,6 @@ void vguacd_log(guac_client_log_level level, const char* format,
     /* Convert log level to syslog priority */
     switch (level) {
 
-        /* Emergency log level */
-        case GUAC_LOG_EMERGENCY:
-            priority = LOG_EMERG;
-            priority_name = "EMERGENCY";
-            break;
-
-        /* Alert log level */
-        case GUAC_LOG_ALERT:
-            priority = LOG_ALERT;
-            priority_name = "ALERT";
-            break;
-
-        /* Critical log level */
-        case GUAC_LOG_CRITICAL:
-            priority = LOG_CRIT;
-            priority_name = "CRITICAL";
-            break;
-
         /* Error log level */
         case GUAC_LOG_ERROR:
             priority = LOG_ERR;
@@ -76,12 +58,6 @@ void vguacd_log(guac_client_log_level level, const char* format,
             priority_name = "WARNING";
             break;
 
-        /* Notice log level */
-        case GUAC_LOG_NOTICE:
-            priority = LOG_NOTICE;
-            priority_name = "NOTICE";
-            break;
-
         /* Informational log level */
         case GUAC_LOG_INFO:
             priority = LOG_INFO;
diff --git a/src/libguac/client-handlers.c b/src/libguac/client-handlers.c
index 69979514..a12e5336 100644
--- a/src/libguac/client-handlers.c
+++ b/src/libguac/client-handlers.c
@@ -320,7 +320,7 @@ int __guac_handle_end(guac_client* client, guac_instruction* instruction) {
 }
 
 int __guac_handle_disconnect(guac_client* client, guac_instruction* instruction) {
-    guac_client_log(client, GUAC_LOG_NOTICE,
+    guac_client_log(client, GUAC_LOG_INFO,
             "Disconnect requested. Stopping client...");
     guac_client_stop(client);
     return 0;
diff --git a/src/libguac/guacamole/client-types.h b/src/libguac/guacamole/client-types.h
index 201a34d8..ec32b95a 100644
--- a/src/libguac/guacamole/client-types.h
+++ b/src/libguac/guacamole/client-types.h
@@ -59,50 +59,29 @@ typedef enum guac_client_state {
 
 /**
  * All supported log levels used by the logging subsystem of each Guacamole
- * client. These log levels correspond to the log levels defined by RFC 5424.
+ * client. These log levels correspond to a subset of the log levels defined by
+ * RFC 5424.
  */
 typedef enum guac_client_log_level {
 
     /**
-     * Emergencies which render the system unusable.
-     */
-    GUAC_LOG_EMERGENCY = 0,
-
-    /**
-     * The system may be usable, but the current state is dangerous enough that
-     * action must be taken immediately.
-     */
-    GUAC_LOG_ALERT = 1,
-
-    /**
-     * Critically-important messages.
-     */
-    GUAC_LOG_CRITICAL = 2,
-
-    /**
-     * General errors: important, but not necessarily critically so.
+     * Fatal errors.
      */
     GUAC_LOG_ERROR = 3,
 
     /**
-     * Non-fatal conditions that are likely unintentional.
+     * Non-fatal conditions that indicate problems.
      */
     GUAC_LOG_WARNING = 4,
 
     /**
-     * Significant but normal conditions.
-     */
-    GUAC_LOG_NOTICE = 5,
-
-    /**
-     * Normal conditions that may be interesting but in most cases should be
-     * ignored.
+     * Informational messages of general interest to users or administrators.
      */
     GUAC_LOG_INFO = 6,
 
     /**
-     * Informational messages that are too frequent or too detailed for a more
-     * severe log level, but can be useful for debugging.
+     * Informational messages which can be useful for debugging, but are
+     * otherwise not useful to users or administrators.
      */
     GUAC_LOG_DEBUG = 7