Skip to content

Commit c3f66f3

Browse files
committed
Merge pull request #3 from launchdarkly/pk/logging-improvements
made logging messages safer and included [LDClient] tag so people know w...
2 parents 9e2afac + d8412d3 commit c3f66f3

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

lib/ldclient-rb/config.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Config
2020
#
2121
# @return [type] [description]
2222
def initialize(opts = {})
23-
@base_uri = opts[:base_uri] || Config.default_base_uri
23+
@base_uri = (opts[:base_uri] || Config.default_base_uri).chomp("/")
2424
@capacity = opts[:capacity] || Config.default_capacity
2525
@logger = opts[:logger] || Config.default_logger
2626
@store = opts[:store] || Config.default_store

lib/ldclient-rb/ldclient.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def initialize(api_key, config = Config.default)
4949
req.body = events.to_json
5050
end
5151
if res.status != 200
52-
@config.logger.error("Unexpected status code while processing events: " + res.status)
52+
@config.logger.error("[LDClient] Unexpected status code while processing events: #{res.status}")
5353
end
5454
end
5555

@@ -95,7 +95,7 @@ def get_flag?(key, user, default=false)
9595
add_event({:kind => 'feature', :key => key, :user => user, :value => value})
9696
return value
9797
rescue StandardError => error
98-
@config.logger.error("Unhandled exception in get_flag: " + error.message)
98+
@config.logger.error("[LDClient] Unhandled exception in get_flag: #{error.message}")
9999
default
100100
end
101101
end
@@ -105,7 +105,7 @@ def add_event(event)
105105
event[:creationDate] = (Time.now.to_f * 1000).to_i
106106
@queue.push(event)
107107
else
108-
@config.logger.warn("Exceeded event queue capacity. Increase capacity to avoid dropping events.")
108+
@config.logger.warn("[LDClient] Exceeded event queue capacity. Increase capacity to avoid dropping events.")
109109
end
110110
end
111111

@@ -124,7 +124,7 @@ def send_event(event_name, user, data)
124124
def get_flag_int(key, user, default)
125125

126126
unless user
127-
@config.logger.error("Must specify user")
127+
@config.logger.error("[LDClient] Must specify user")
128128
return default
129129
end
130130

@@ -135,17 +135,17 @@ def get_flag_int(key, user, default)
135135
end
136136

137137
if res.status == 401
138-
@config.logger.error("Invalid API key")
138+
@config.logger.error("[LDClient] Invalid API key")
139139
return default
140140
end
141141

142142
if res.status == 404
143-
@config.logger.error("Unknown feature key: " + key)
143+
@config.logger.error("[LDClient] Unknown feature key: #{key}")
144144
return default
145145
end
146146

147147
if res.status != 200
148-
@config.logger.error("Unexpected status code " + res.status)
148+
@config.logger.error("[LDClient] Unexpected status code #{res.status}")
149149
return default
150150
end
151151

0 commit comments

Comments
 (0)