diff options
| author | Corey Hulen <corey@hulen.com> | 2015-09-23 14:04:08 -0700 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2015-09-23 14:04:08 -0700 |
| commit | d792745f54463772472bec23b0caaae703eaddb3 (patch) | |
| tree | d98c966e0f273c5a6052e3c154bd7d75d091aa27 /api/file_benchmark_test.go | |
| parent | 0170cfe604e6cfb430be0b6181243ca85a9ab27b (diff) | |
| parent | ccf2e6e4e74fc249a094c2c27de675644f1065cb (diff) | |
| download | chat-d792745f54463772472bec23b0caaae703eaddb3.tar.gz chat-d792745f54463772472bec23b0caaae703eaddb3.tar.bz2 chat-d792745f54463772472bec23b0caaae703eaddb3.zip | |
Merge pull request #752 from mattermost/PLT-11-email
PLT-11 Cleaned up config file and added ability to makes changes from the admin console.
Diffstat (limited to 'api/file_benchmark_test.go')
| -rw-r--r-- | api/file_benchmark_test.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/file_benchmark_test.go b/api/file_benchmark_test.go index 251ff7793..47f8bff43 100644 --- a/api/file_benchmark_test.go +++ b/api/file_benchmark_test.go @@ -38,7 +38,7 @@ func BenchmarkGetFile(b *testing.B) { newProps["time"] = fmt.Sprintf("%v", model.GetMillis()) data := model.MapToJson(newProps) - hash := model.HashPassword(fmt.Sprintf("%v:%v", data, utils.Cfg.ServiceSettings.PublicLinkSalt)) + hash := model.HashPassword(fmt.Sprintf("%v:%v", data, utils.Cfg.FileSettings.PublicLinkSalt)) // wait a bit for files to ready time.Sleep(5 * time.Second) |