Browse Source

SLF4J Logging in FDNotify Plugin.

pull/415/head
Greg Holmes 9 years ago
parent
commit
d5838f6600

+ 10
- 10
freedesktop_notifications/src/com/dmdirc/addons/freedesktop_notifications/FDManager.java View File

24
 
24
 
25
 import com.dmdirc.ClientModule.GlobalConfig;
25
 import com.dmdirc.ClientModule.GlobalConfig;
26
 import com.dmdirc.ClientModule.UserConfig;
26
 import com.dmdirc.ClientModule.UserConfig;
27
-import com.dmdirc.DMDircMBassador;
28
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
27
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
29
 import com.dmdirc.config.prefs.PreferencesCategory;
28
 import com.dmdirc.config.prefs.PreferencesCategory;
30
 import com.dmdirc.config.prefs.PreferencesDialogModel;
29
 import com.dmdirc.config.prefs.PreferencesDialogModel;
31
 import com.dmdirc.config.prefs.PreferencesSetting;
30
 import com.dmdirc.config.prefs.PreferencesSetting;
32
 import com.dmdirc.config.prefs.PreferencesType;
31
 import com.dmdirc.config.prefs.PreferencesType;
33
 import com.dmdirc.events.ClientPrefsOpenedEvent;
32
 import com.dmdirc.events.ClientPrefsOpenedEvent;
34
-import com.dmdirc.events.UserErrorEvent;
35
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
33
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
36
 import com.dmdirc.interfaces.config.ConfigChangeListener;
34
 import com.dmdirc.interfaces.config.ConfigChangeListener;
37
 import com.dmdirc.interfaces.config.ConfigProvider;
35
 import com.dmdirc.interfaces.config.ConfigProvider;
38
-import com.dmdirc.logger.ErrorLevel;
39
 import com.dmdirc.plugins.PluginDomain;
36
 import com.dmdirc.plugins.PluginDomain;
40
 import com.dmdirc.plugins.PluginInfo;
37
 import com.dmdirc.plugins.PluginInfo;
41
 import com.dmdirc.plugins.implementations.PluginFilesHelper;
38
 import com.dmdirc.plugins.implementations.PluginFilesHelper;
50
 import javax.inject.Inject;
47
 import javax.inject.Inject;
51
 import javax.inject.Singleton;
48
 import javax.inject.Singleton;
52
 
49
 
50
+import org.slf4j.Logger;
51
+import org.slf4j.LoggerFactory;
52
+
53
 import net.engio.mbassy.listener.Handler;
53
 import net.engio.mbassy.listener.Handler;
54
 
54
 
55
+import static com.dmdirc.util.LogUtils.USER_ERROR;
56
+
55
 @Singleton
57
 @Singleton
56
 public class FDManager implements ConfigChangeListener {
58
 public class FDManager implements ConfigChangeListener {
57
 
59
 
60
+    private static final Logger LOG = LoggerFactory.getLogger(FDManager.class);
58
     /** Global configuration. */
61
     /** Global configuration. */
59
     private final AggregateConfigProvider config;
62
     private final AggregateConfigProvider config;
60
     /** User configuration. */
63
     /** User configuration. */
63
     private final String domain;
66
     private final String domain;
64
     /** Plugin files helper. */
67
     /** Plugin files helper. */
65
     private final PluginFilesHelper filesHelper;
68
     private final PluginFilesHelper filesHelper;
66
-    /** The event bus to post errors to. */
67
-    private final DMDircMBassador eventBus;
68
     private final PluginInfo pluginInfo;
69
     private final PluginInfo pluginInfo;
69
     /** notification timeout. */
70
     /** notification timeout. */
70
     private int timeout;
71
     private int timeout;
81
             @UserConfig final ConfigProvider userConfig,
82
             @UserConfig final ConfigProvider userConfig,
82
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final String domain,
83
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final String domain,
83
             final PluginFilesHelper filesHelper,
84
             final PluginFilesHelper filesHelper,
84
-            final DMDircMBassador eventBus,
85
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final PluginInfo pluginInfo) {
85
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final PluginInfo pluginInfo) {
86
         this.domain = domain;
86
         this.domain = domain;
87
         this.config = config;
87
         this.config = config;
88
         this.userConfig = userConfig;
88
         this.userConfig = userConfig;
89
         this.filesHelper = filesHelper;
89
         this.filesHelper = filesHelper;
90
-        this.eventBus = eventBus;
91
         this.pluginInfo = pluginInfo;
90
         this.pluginInfo = pluginInfo;
92
     }
91
     }
93
 
92
 
126
             try {
125
             try {
127
                 myProcess.waitFor();
126
                 myProcess.waitFor();
128
             } catch (InterruptedException e) {
127
             } catch (InterruptedException e) {
128
+                //Not a proble, carry on
129
             }
129
             }
130
             return true;
130
             return true;
131
         } catch (SecurityException | IOException e) {
131
         } catch (SecurityException | IOException e) {
132
+            LOG.info(USER_ERROR, "Unable to show notification", e);
132
         }
133
         }
133
 
134
 
134
         return false;
135
         return false;
173
             filesHelper.extractResourcesEndingWith(".py");
174
             filesHelper.extractResourcesEndingWith(".py");
174
             filesHelper.extractResourcesEndingWith(".png");
175
             filesHelper.extractResourcesEndingWith(".png");
175
         } catch (IOException ex) {
176
         } catch (IOException ex) {
176
-            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
177
-                    "Unable to extract files for Free desktop notifications: " + ex.getMessage(),
178
-                    ""));
177
+            LOG.warn(USER_ERROR, "Unable to extract files for Free desktop notifications: {}",
178
+                    ex.getMessage(), ex);
179
         }
179
         }
180
     }
180
     }
181
 
181
 

Loading…
Cancel
Save