From be43a7474a8f9916eaa68077e42c8c2f88d8e13a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Tue, 18 Oct 2016 18:03:02 +0200 Subject: [PATCH 1/2] Remove line break from the token file when loading it --- lib/remote_storage/swift.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/remote_storage/swift.rb b/lib/remote_storage/swift.rb index ec7544c..ed527bb 100644 --- a/lib/remote_storage/swift.rb +++ b/lib/remote_storage/swift.rb @@ -433,7 +433,10 @@ module RemoteStorage def reload_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 server.logger.debug "Reloaded swift token. New token: #{settings.swift_token}" end From c1ed996b1dce056982229c1d3105ff3956a668c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Greg=20Kar=C3=A9kinian?= Date: Wed, 19 Oct 2016 15:05:30 +0200 Subject: [PATCH 2/2] Only send the first 20 characters of the token --- lib/remote_storage/swift.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/remote_storage/swift.rb b/lib/remote_storage/swift.rb index ed527bb..2fb5fa4 100644 --- a/lib/remote_storage/swift.rb +++ b/lib/remote_storage/swift.rb @@ -457,7 +457,7 @@ module RemoteStorage rescue RestClient::Unauthorized => ex Raven.capture_exception( 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 } ) server.halt 500