diff options
| author | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-23 11:06:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-23 11:06:25 -0400 |
| commit | 5c1049054eace710abd3418bbad141fbb7dd5d7f (patch) | |
| tree | 24d75c14ce2aae2c6f1a8d5bc7392e958e416666 /app | |
| parent | 69f3f2fdce4ae21a037ca61d753279efcc70f0ec (diff) | |
| download | chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.gz chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.tar.bz2 chat-5c1049054eace710abd3418bbad141fbb7dd5d7f.zip | |
PLT-6471 Properly panic when translations can't be loaded (#6414)
* PLT-6471 Properly panic when translations can't be loaded
* Print usage messages when errors occur during CLI initialization
* Reverted behaviour of FindDir and added second return value to it
* Fixed merge conflict
Diffstat (limited to 'app')
| -rw-r--r-- | app/auto_posts.go | 2 | ||||
| -rw-r--r-- | app/saml.go | 3 | ||||
| -rw-r--r-- | app/user.go | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/auto_posts.go b/app/auto_posts.go index 07d260846..6a2a15908 100644 --- a/app/auto_posts.go +++ b/app/auto_posts.go @@ -41,7 +41,7 @@ func NewAutoPostCreator(client *model.Client, channelid string) *AutoPostCreator func (cfg *AutoPostCreator) UploadTestFile() ([]string, bool) { filename := cfg.ImageFilenames[utils.RandIntFromRange(utils.Range{Begin: 0, End: len(cfg.ImageFilenames) - 1})] - path := utils.FindDir("web/static/images") + path, _ := utils.FindDir("web/static/images") file, err := os.Open(path + "/" + filename) defer file.Close() diff --git a/app/saml.go b/app/saml.go index 8a6e6f16c..730e29efc 100644 --- a/app/saml.go +++ b/app/saml.go @@ -42,7 +42,8 @@ func WriteSamlFile(fileData *multipart.FileHeader) *model.AppError { return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.open.app_error", nil, err.Error()) } - out, err := os.Create(utils.FindDir("config") + filename) + configDir, _ := utils.FindDir("config") + out, err := os.Create(configDir + filename) if err != nil { return model.NewLocAppError("AddSamlCertificate", "api.admin.add_certificate.saving.app_error", nil, err.Error()) } diff --git a/app/user.go b/app/user.go index 44e1ce3f6..2a570c7ac 100644 --- a/app/user.go +++ b/app/user.go @@ -709,7 +709,8 @@ func CreateProfileImage(username string, userId string) ([]byte, *model.AppError initial := string(strings.ToUpper(username)[0]) - fontBytes, err := ioutil.ReadFile(utils.FindDir("fonts") + utils.Cfg.FileSettings.InitialFont) + fontDir, _ := utils.FindDir("fonts") + fontBytes, err := ioutil.ReadFile(fontDir + utils.Cfg.FileSettings.InitialFont) if err != nil { return nil, model.NewLocAppError("CreateProfileImage", "api.user.create_profile_image.default_font.app_error", nil, err.Error()) } |