Projet

Général

Profil

0001-misc-remove-support-for-sentry-35566.patch

Frédéric Péters, 24 août 2019 18:02

Télécharger (3,44 ko)

Voir les différences: 

Subject: [PATCH] misc: remove support for sentry (#35566)


 debian/control                 |  2 --
 debian/debian_config_common.py | 22 +---------------------
 tests_passerelle/settings.py   |  2 +-
 tox.ini                        |  1 -
 4 files changed, 2 insertions(+), 25 deletions(-)
debian/control
12 12 
    python-django (>= 1:1.11),
13 13 
    python-celery (>= 3.1.13),
14 14 
    python-requests,
15 
    python-raven,
16 15 
    python-graypy,
17 16 
    python-apt,
18 17 
    python-memcache,
......
33 32 
    python3-django (>= 1:1.11),
34 33 
    python3-celery (>= 3.1.13),
35 34 
    python3-requests,
36 
    python3-raven,
37 35 
    python3-graypy,
38 36 
    python3-apt,
39 37 
    python3-memcache,
debian/debian_config_common.py
90 90 
            'class': 'hobo.multitenant.log.AdminEmailHandler',
91 91 
            'include_html': True,
92 92 
        },
93 
        'sentry': {
94 
            'level': 'ERROR',
95 
            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
96 
        },
97 93 
    },
98 94 
    'loggers': {
99 95 
        'django.db': {
......
132 128 
            'level': 'INFO',
133 129 
            'propagate': True,
134 130 
        },
135 
        # log sentry failures to syslog
136 
        'sentry.errors': {
137 
            'handlers': ['syslog'],
138 
            'level': 'ERROR',
139 
            'propagate': False,
140 
        },
141 131 
        # lasso has the bad habit of logging everything as errors
142 132 
        'Lasso': {
143 133 
            'filters': ['force_debug'],
......
157 147 
        '': {
158 148 
            'level': hobo.logger.SettingsLogLevel(
159 149 
                default_log_level='INFO'),
160 
            'handlers': ['syslog', 'mail_admins', 'sentry'],
150 
            'handlers': ['syslog', 'mail_admins'],
161 151 
        },
162 152 
    },
163 153 
}
......
177 167 
        LOGGING['loggers']['']['handlers'].remove('syslog')
178 168 
        LOGGING['loggers']['']['handlers'].append('journald')
179 169 

  		




  180
  
  
    
# Sentry support

  		




  181
  
  
    
if 'SENTRY_DSN' in os.environ:

  		




  182
  
  
    
    try:

  		




  183
  
  
    
        from raven.transport.requests import RequestsHTTPTransport

  		




  184
  
  
    
    except ImportError:

  		




  185
  
  
    
        raise ImproperlyConfigured('cannot configure raven, import of RequestsHTTPTransport failed')

  		




  186
  
  
    
    else:

  		




  187
  
  
    
        SENTRY_DSN = os.environ['SENTRY_DSN']

  		




  188
  
  
    
        SENTRY_TRANSPORT = RequestsHTTPTransport

  		




  189
  
  
    

  		




  190
  170
  
    
ETC_DIR = '/etc/%s' % PROJECT_NAME

  		




  191
  171
  
    
VAR_DIR = '/var/lib/%s' % PROJECT_NAME

  		




  192
  172
  
    

  		












  

    
      tests_passerelle/settings.py
    
  





  26
  26
  
    
# suds logs are buggy

  		




  27
  27
  
    
LOGGING['loggers']['suds'] = {

  		




  28
  28
  
    
        'level': 'ERROR',

  		




  29
  
  
    
        'handlers': ['mail_admins', 'sentry'],

  		




  
  29
  
    
        'handlers': ['mail_admins'],

  		




  30
  30
  
    
        'propagate': True,

  		




  31
  31
  
    
}

  		












  

    
      tox.ini
    
  





  35
  35
  
    
	pytest-django

  		




  36
  36
  
    
	pytest-mock

  		




  37
  37
  
    
	coverage

  		




  38
  
  
    
	raven

  		




  39
  38
  
    
	cssselect

  		




  40
  39
  
    
	WebTest

  		




  41
  40
  
    
	django-mellon

  		




  42
  
  
    
-