diff options
| author | Christopher Speller <crspeller@gmail.com> | 2018-07-27 05:25:53 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2018-07-27 08:25:53 -0400 |
| commit | 026f0152a8fdc81d9d96c9d62321a78ef65d837b (patch) | |
| tree | f986df6073db16b6ce3ca0bfeb3cfe328960125d /app/plugin_api.go | |
| parent | 90e5e279c175b238d58432acb5eb6422ddfe22e7 (diff) | |
| download | chat-026f0152a8fdc81d9d96c9d62321a78ef65d837b.tar.gz chat-026f0152a8fdc81d9d96c9d62321a78ef65d837b.tar.bz2 chat-026f0152a8fdc81d9d96c9d62321a78ef65d837b.zip | |
Adding FileWillBeUploaded plugin hook (#9169)
* Adding file upload hook.
* Adding hook test for FileWillBeUploaded
* Some debugging fixes.
* Fix typo.
* Fixing double close
* Fix capitalization on docs.
Diffstat (limited to 'app/plugin_api.go')
| -rw-r--r-- | app/plugin_api.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/plugin_api.go b/app/plugin_api.go index 5e603a44e..414ce4d6e 100644 --- a/app/plugin_api.go +++ b/app/plugin_api.go @@ -45,9 +45,14 @@ func (api *PluginAPI) LoadPluginConfiguration(dest interface{}) error { } if pluginSettingsJsonBytes, err := json.Marshal(finalConfig); err != nil { - return err + api.logger.Error("Error marshaling config for plugin", mlog.Err(err)) + return nil } else { - return json.Unmarshal(pluginSettingsJsonBytes, dest) + err := json.Unmarshal(pluginSettingsJsonBytes, dest) + if err != nil { + api.logger.Error("Error unmarshaling config for plugin", mlog.Err(err)) + } + return nil } } |