Fix filter_local

AUTHORS

@@ -2,3 +2,4 @@ Kevin Glisson <kevgliss>
 Mike Grima <mikegrima> @THISisPLACEHLDR
 Michal Przytulski <mprzytulski>
 Björn Andersson <bjorn-spire>
+Joakim Uddholm <tethik>

README.md

@@ -208,9 +208,8 @@ unhandled exceptions, forwards them to Sentry and returns the exception like
 any regular error generated by your function.
 
 ### Local Development
-By default the library will only forward errors to Sentry when deployed on
-AWS Lambda, not during local development. If you want to change this behavior
-set the `filter_local` config option to `False`.
+By default the library will not forward errors is if either the `IS_OFFLINE` or `IS_LOCAL` environment variable is set.
+If you want to change this behavior set the `filter_local` config option to `False`.
 
 ### Detecting Slow Running Code
 It's a good practice to specify the function timeout in `serverless.yml` to

raven_python_lambda/__init__.py

@@ -35,6 +35,8 @@ def configure_raven_client(config):
     is_local_env = os.environ.get('IS_OFFLINE') or os.environ.get('IS_LOCAL')
     if config['filter_local'] and is_local_env:
         logger.warning('Sentry is disabled in local environment')
+        config["enabled"] = False
+        return None
 
     defaults = {
         'include_paths': (
@@ -110,6 +112,9 @@ def __init__(self, config=None):
         else:
             self.config['raven_client'] = configure_raven_client(self.config)
 
+        if self.config['logging'] and self.config['raven_client']:
+            setup_logging(SentryHandler(self.config['raven_client']))
+
         if self.config['logging']:
             handler = SentryHandler(self.config['raven_client'])
             handler.setLevel(self.config['log_level'])

raven_python_lambda/tests/test_decorator.py

@@ -21,7 +21,7 @@ def test_can_override_configuration():
 
     assert r.config['logging'] is False, 'expected the config option to be overridden'
 
-    
+
 class FakeContext(object):
     def get_remaining_time_in_millis(self):
         return 300000
@@ -49,3 +49,26 @@ def test_func(event, context):
     # Check that it sent to SQS:
     messages = sqs.receive_message(QueueUrl=sqs_queue)["Messages"]
     assert len(messages) == 1
+
+
+def test_that_local_environment_is_ignored(monkeypatch):
+    keys = ['IS_OFFLINE', 'IS_LOCAL']
+    for k in keys:
+        monkeypatch.setenv(k, 'yes.')
+        wrapper = RavenLambdaWrapper()
+        assert not wrapper.config['enabled']
+        assert not wrapper.config['raven_client']
+        monkeypatch.delenv(k)
+
+
+def test_that_remote_environment_is_not_ignored(monkeypatch):
+    keys = ['IS_OFFLINE', 'IS_LOCAL']
+    for k in keys:
+        try:
+            monkeypatch.delenv(k)
+        except:
+            pass
+
+    wrapper = RavenLambdaWrapper()
+    assert wrapper.config['enabled']
+    assert wrapper.config['raven_client']