5apps/liquor-cabinet
5apps/liquor-cabinet
4
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Activity

Merge pull request #98 from 5apps/bugfix/remove_whitespace_from_token

Browse Source 
Remove line break from the token file when loading it
This commit is contained in:
Greg Karékinian 2016-10-24 15:30:37 +02:00 committed by GitHub
commit 06d234071a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/remote_storage/swift.rb
View File

@ -433,7 +433,10 @@ module RemoteStorage
def reload_swift_token def reload_swift_token
server.logger.debug "Reloading swift token. Old token: #{settings.swift_token}" server.logger.debug "Reloading swift token. Old token: #{settings.swift_token}"
settings.swift_token = File.read(swift_token_path) # Remove the line break from the token file. The line break that the
# token script is adding to the file was causing Sentry to reject the
# token field
settings.swift_token = File.read(swift_token_path).rstrip
settings.swift_token_loaded_at = Time.now settings.swift_token_loaded_at = Time.now
server.logger.debug "Reloaded swift token. New token: #{settings.swift_token}" server.logger.debug "Reloaded swift token. New token: #{settings.swift_token}"
end end
@ -454,7 +457,7 @@ module RemoteStorage
rescue RestClient::Unauthorized => ex rescue RestClient::Unauthorized => ex
Raven.capture_exception( Raven.capture_exception(
ex, ex,
tags: { swift_token: settings.swift_token, tags: { swift_token: settings.swift_token[0..19], # send the first 20 characters
swift_token_loaded_at: settings.swift_token_loaded_at } swift_token_loaded_at: settings.swift_token_loaded_at }
) )
server.halt 500 server.halt 500