Allow default tag context to be set

1 files changed, 7 insertions, 1 deletions

diff --git a/raven/base.py b/raven/base.py
index 99d3362..eb3d24d 100644
--- a/raven/base.py
+++ b/raven/base.py
@@ -182,6 +182,7 @@ class Client(object):
         if context is None:
             context = {'sys.argv': sys.argv[:]}
         self.extra = context
+        self.tags = o.get('tags') or {}
 
         self.module_cache = ModuleProxyCache()
 
@@ -339,11 +340,16 @@ class Client(object):
         data.setdefault('extra', {})
         data.setdefault('level', logging.ERROR)
 
-        # Add extra context
+        # Add default extra context
         if self.extra:
             for k, v in six.iteritems(self.extra):
                 data['extra'].setdefault(k, v)
 
+        # Add default tag context
+        if self.tags:
+            for k, v in six.iteritems(self.tags):
+                data['tags'].setdefault(k, v)
+
         for k, v in six.iteritems(extra):
             data['extra'][k] = v