paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-10 00:46:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Remove remaining DEPLOYMENT_ROLE_* code remnants.

Browse Source 
These should have been removed when we removed Zilencer.
This commit is contained in:
Tim Abbott
2017-10-23 21:14:22 -07:00
parent 7fd7e054e1
commit ad165a6f8f
2 changed files with 1 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zerver/worker/queue_processors.py
View File

@@ -286,17 +286,6 @@ class PushNotificationsWorker(QueueProcessingWorker):
# type: (Mapping[str, Any]) -> None # type: (Mapping[str, Any]) -> None
handle_push_notification(data['user_profile_id'], data) handle_push_notification(data['user_profile_id'], data)
def make_feedback_client():
# type: () -> Any # Should be zulip.Client, but not necessarily importable
sys.path.append(os.path.join(os.path.dirname(__file__), '../../api'))
import zulip
return zulip.Client(
client="ZulipFeedback/0.1",
email=settings.DEPLOYMENT_ROLE_NAME,
api_key=settings.DEPLOYMENT_ROLE_KEY,
verbose=True,
site=settings.FEEDBACK_TARGET)
# We probably could stop running this queue worker at all if ENABLE_FEEDBACK is False # We probably could stop running this queue worker at all if ENABLE_FEEDBACK is False
@assign_queue('feedback_messages') @assign_queue('feedback_messages')
class FeedbackBot(QueueProcessingWorker): class FeedbackBot(QueueProcessingWorker):
@@ -307,24 +296,10 @@ class FeedbackBot(QueueProcessingWorker):
@assign_queue('error_reports') @assign_queue('error_reports')
class ErrorReporter(QueueProcessingWorker): class ErrorReporter(QueueProcessingWorker):
def start(self):
# type: () -> None
if settings.DEPLOYMENT_ROLE_KEY:
self.staging_client = make_feedback_client()
self.staging_client._register(
'forward_error',
method='POST',
url='deployments/report_error',
make_request=(lambda type, report: {'type': type, 'report': ujson.dumps(report)}),
)
QueueProcessingWorker.start(self)
def consume(self, event): def consume(self, event):
# type: (Mapping[str, Any]) -> None # type: (Mapping[str, Any]) -> None
logging.info("Processing traceback with type %s for %s" % (event['type'], event.get('user_email'))) logging.info("Processing traceback with type %s for %s" % (event['type'], event.get('user_email')))
if settings.DEPLOYMENT_ROLE_KEY: if settings.ERROR_REPORTING:
self.staging_client.forward_error(event['type'], event['report'])
elif settings.ERROR_REPORTING:
do_report_error(event['report']['host'], event['type'], event['report']) do_report_error(event['report']['host'], event['type'], event['report'])
@assign_queue('slow_queries', queue_type="loop") @assign_queue('slow_queries', queue_type="loop")

5
zproject/settings.py
View File

@@ -309,9 +309,6 @@ DEFAULT_SETTINGS.update({
# Configuration for JWT auth. # Configuration for JWT auth.
'JWT_AUTH_KEYS': {}, 'JWT_AUTH_KEYS': {},
# TODO: Remove the remains of the legacy "deployment" system.
'DEPLOYMENT_ROLE_NAME': "",
# https://docs.djangoproject.com/en/1.11/ref/settings/#std:setting-SERVER_EMAIL # https://docs.djangoproject.com/en/1.11/ref/settings/#std:setting-SERVER_EMAIL
# Django setting for what from address to use in error emails. We # Django setting for what from address to use in error emails. We
# set this to ZULIP_ADMINISTRATOR by default. # set this to ZULIP_ADMINISTRATOR by default.
@@ -675,8 +672,6 @@ if EMAIL_GATEWAY_PATTERN != "":
else: else:
EMAIL_GATEWAY_EXAMPLE = "" EMAIL_GATEWAY_EXAMPLE = ""
DEPLOYMENT_ROLE_KEY = get_secret("deployment_role_key")
######################################################################## ########################################################################
# STATSD CONFIGURATION # STATSD CONFIGURATION
######################################################################## ########################################################################