Vendor nylas-production-python (#75)

bin/backfix-duplicate-categories.py

@@ -7,12 +7,12 @@
 from itertools import chain
 
 import click
-from nylas.logging import configure_logging, get_logger
 from sqlalchemy import func
 from sqlalchemy.sql import and_, exists
 
 from inbox.error_handling import maybe_enable_rollbar
 from inbox.ignition import engine_manager
+from inbox.logging import configure_logging, get_logger
 from inbox.models import Category, MessageCategory
 from inbox.models.session import session_scope_by_shard_id
 

bin/backfix-generic-imap-separators.py

@@ -2,10 +2,10 @@
 # We previously didn't store IMAP path separators for generic imap accounts.
 # This script backfixes the accounts.
 import click
-from nylas.logging import configure_logging, get_logger
 
 from inbox.crispin import connection_pool
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.models.backends.generic import GenericAccount
 from inbox.models.session import (
     global_session_scope,

bin/balance-fleet

@@ -10,10 +10,10 @@ import time
 
 import click
 from munkres import Munkres, make_cost_matrix
-from nylas.logging import configure_logging, get_logger
 
 from inbox.config import config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.models.account import Account
 from inbox.models.session import global_session_scope, session_scope
 from inbox.scheduling.deferred_migration import (

bin/check-attachments

@@ -10,12 +10,12 @@ from collections import defaultdict
 import click
 import gevent
 from gevent.pool import Pool
-from nylas.logging import configure_logging, get_logger
 from sqlalchemy import true
 from sqlalchemy.sql.expression import func
 
 from inbox.crispin import connection_pool
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.models import Account, Block
 from inbox.models.backends.generic import GenericAccount
 from inbox.models.session import (

bin/clear-heartbeat-status

@@ -3,11 +3,11 @@
 from sys import exit
 
 import click
-from nylas.logging import configure_logging, get_logger
 
 from inbox.config import config
 from inbox.error_handling import maybe_enable_rollbar
 from inbox.heartbeat.status import clear_heartbeat_status
+from inbox.logging import configure_logging, get_logger
 
 configure_logging(config.get('LOGLEVEL'))
 log = get_logger()

bin/contact-search-backfill

@@ -8,10 +8,10 @@ import gevent_openssl
 gevent_openssl.monkey_patch()
 
 import click
-from nylas.logging import configure_logging, get_logger
 
 from inbox.contacts.search import index_namespace
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 
 configure_logging()
 log = get_logger()

bin/contact-search-delete-index

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 import click
-from nylas.logging import configure_logging, get_logger
 
 from inbox.contacts.search import delete_namespace_indexes as delete_indexes
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 
 configure_logging()
 log = get_logger()

bin/contact-search-service

@@ -11,11 +11,11 @@ monkey.patch_all()
 import os
 
 import click
-from nylas.logging import configure_logging
 from setproctitle import setproctitle
 
 from inbox.config import config as inbox_config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging
 from inbox.util.startup import preflight
 
 setproctitle("nylas-contact-search-index-service")
@@ -39,10 +39,6 @@ def main(prod, config):
         config_path = os.path.abspath(config)
         load_overrides(config_path)
 
-    if 'CONTACTS_SEARCH' in inbox_config and 'SENTRY_DSN' in \
-            inbox_config['CONTACTS_SEARCH']:
-        os.environ['SENTRY_DSN'] = inbox_config['CONTACTS_SEARCH']['SENTRY_DSN']
-
     # import here to make sure config overrides are loaded
     from inbox.transactions.search import ContactSearchIndexService
 

bin/create-event-contact-associations.py

@@ -6,12 +6,12 @@
 from __future__ import division
 
 import click
-from nylas.logging import configure_logging, get_logger
 from sqlalchemy import asc
 
 from inbox.contacts.processing import update_contacts_from_event
 from inbox.error_handling import maybe_enable_rollbar
 from inbox.ignition import engine_manager
+from inbox.logging import configure_logging, get_logger
 from inbox.models import Event
 from inbox.models.session import session_scope_by_shard_id
 from inbox.models.util import limitlion

bin/deferred-migration-service

@@ -5,10 +5,10 @@ import gevent.monkey
 
 gevent.monkey.patch_all()
 
-from nylas.logging import configure_logging
 from setproctitle import setproctitle
 
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging
 from inbox.scheduling.deferred_migration import DeferredAccountMigrationExecutor
 
 configure_logging()

bin/delete-marked-accounts

@@ -8,6 +8,8 @@ Includes:
 * Account liveness/status data (in Redis).
 
 """
+from __future__ import absolute_import
+
 from gevent import monkey
 
 monkey.patch_all()
@@ -16,10 +18,10 @@ import logging
 
 import click
 import gevent
-from nylas.logging import configure_logging, get_logger
 
 from inbox.config import config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.models.util import batch_delete_namespaces, get_accounts_to_delete
 
 configure_logging(logging.INFO)

bin/inbox-api

@@ -30,10 +30,10 @@ except ImportError:
 
 import click
 from gevent.pywsgi import WSGIServer
-from nylas.api.wsgi import NylasWSGIHandler
-from nylas.logging import configure_logging, get_logger
 
+from inbox.api.wsgi import NylasWSGIHandler
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.mailsync.frontend import SyncbackHTTPFrontend
 from inbox.util.startup import load_overrides, preflight
 

bin/inbox-auth

@@ -14,12 +14,11 @@ from setproctitle import setproctitle
 
 setproctitle('inbox-auth')
 
-from nylas.logging import configure_logging
-
 from inbox.auth.base import handler_from_provider
 from inbox.basicauth import NotSupportedError
 from inbox.config import config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging
 from inbox.models import Account
 from inbox.models.session import session_scope
 from inbox.util.startup import preflight

bin/inbox-console

@@ -10,7 +10,8 @@ from setproctitle import setproctitle
 setproctitle('inbox-console')
 
 import click
-from nylas.logging import get_logger
+
+from inbox.logging import get_logger
 
 log = get_logger()
 

bin/inbox-start

@@ -26,9 +26,8 @@ except ImportError:
              "Maybe the Vagrant box provisioning didn't succeed?\n"
              "Try running sudo ./setup.sh")
 
-from nylas.logging import configure_logging, get_logger
-
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.mailsync.frontend import SyncHTTPFrontend
 from inbox.mailsync.service import SyncService
 from inbox.util.logging_helper import reconfigure_logging
@@ -85,8 +84,6 @@ def main(prod, enable_tracer, enable_profiler, config, process_num, exit_after):
 
     maybe_enable_rollbar()
 
-    os.environ["SENTRY_DSN"] = inbox_config.get("SENTRY_DSN", "")
-
     if config is not None:
         from inbox.util.startup import load_overrides
         config_path = os.path.abspath(config)

bin/populate-sync-queue

@@ -10,11 +10,11 @@ import gevent
 import gevent.monkey
 
 gevent.monkey.patch_all()
-from nylas.logging import configure_logging
 from setproctitle import setproctitle
 
 from inbox.config import config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging
 from inbox.scheduling.queue import QueuePopulator
 
 configure_logging()

bin/purge-transaction-log

@@ -4,6 +4,8 @@ Deletes entries in the transaction older than `days_ago` days( as measured by
 the created_at column)
 
 """
+from __future__ import absolute_import
+
 from gevent import monkey
 
 monkey.patch_all()
@@ -12,10 +14,10 @@ import logging
 
 import click
 import gevent
-from nylas.logging import configure_logging, get_logger
 
 from inbox.config import config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging, get_logger
 from inbox.models.util import purge_transactions
 
 configure_logging(logging.INFO)

bin/restart-forgotten-accounts

@@ -5,10 +5,9 @@ import gevent.monkey
 
 gevent.monkey.patch_all()
 
-from nylas.logging import configure_logging, get_logger
-
 from inbox.error_handling import maybe_enable_rollbar
 from inbox.ignition import engine_manager
+from inbox.logging import configure_logging, get_logger
 from inbox.mailsync.service import shared_sync_event_queue_for_zone
 from inbox.models.account import Account
 from inbox.models.session import global_session_scope

bin/syncback-service

@@ -16,11 +16,11 @@ gevent_openssl.monkey_patch()
 import os
 
 import click
-from nylas.logging import configure_logging
 from setproctitle import setproctitle
 
 from inbox.config import config as inbox_config
 from inbox.error_handling import maybe_enable_rollbar
+from inbox.logging import configure_logging
 from inbox.mailsync.frontend import SyncbackHTTPFrontend
 from inbox.transactions.actions import SyncbackService
 from inbox.util.logging_helper import reconfigure_logging
@@ -57,8 +57,6 @@ def main(prod, config, process_num, syncback_id, enable_tracer,
     configure_logging(log_level=level)
     reconfigure_logging()
 
-    os.environ["SENTRY_DSN"] = inbox_config.get("SENTRY_DSN", "")
-
     total_processes = int(os.environ.get('SYNCBACK_PROCESSES', 1))
 
     def start():

inbox/actions/backends/generic.py

@@ -5,8 +5,7 @@
 from collections import defaultdict
 from imaplib import IMAP4
 
-from nylas.logging import get_logger
-
+from inbox.logging import get_logger
 from inbox.mailsync.backends.imap.generic import uidvalidity_cb
 from inbox.models import Account, Category, Folder, Message
 from inbox.models.backends.imap import ImapUid

inbox/actions/base.py

@@ -23,8 +23,6 @@
 at-least-once semantics.
 
 """
-from nylas.logging import get_logger
-
 from inbox.actions.backends.generic import (
     remote_create_folder,
     remote_delete_draft,
@@ -44,6 +42,7 @@
     remote_delete_label,
     remote_update_label,
 )
+from inbox.logging import get_logger
 from inbox.models import Message
 from inbox.models.session import session_scope
 

inbox/api/err.py

@@ -1,9 +1,10 @@
 import sys
 import traceback
 
+import rollbar
 from flask import jsonify, make_response, request
-from nylas.logging.log import create_error_log_context, get_logger
-from nylas.logging.sentry import sentry_alert
+
+from inbox.logging import create_error_log_context, get_logger
 
 log = get_logger()
 
@@ -14,15 +15,14 @@ def get_request_uid(headers):
     return headers.get("X-Unique-ID")
 
 
-def log_exception(exc_info, send_to_sentry=True, **kwargs):
+def log_exception(exc_info, **kwargs):
     """ Add exception info to the log context for the request.
 
     We do not log in a separate log statement in order to make debugging
     easier. As a bonus, this reduces log volume somewhat.
 
     """
-    if send_to_sentry:
-        sentry_alert()
+    rollbar.report_exc_info(exc_info)
 
     if not is_live_env():
         print
@@ -108,7 +108,7 @@ class AccountDoesNotExistError(APIException):
 
 
 def err(http_code, message, **kwargs):
-    """ Handle unexpected errors, including sending the traceback to Sentry. """
+    """ Handle unexpected errors, including sending the traceback to Rollbar. """
     log_exception(sys.exc_info(), user_error_message=message, **kwargs)
     resp = {"type": "api_error", "message": message}
     resp.update(kwargs)

inbox/api/kellogs.py

@@ -4,8 +4,8 @@
 
 import arrow
 from flask import Response
-from nylas.logging import get_logger
 
+from inbox.logging import get_logger
 from inbox.models import (
     Account,
     Block,

inbox/api/ns_api.py

@@ -130,7 +130,7 @@
     pass
 
 
-from nylas.logging import get_logger
+from inbox.logging import get_logger
 
 log = get_logger()
 

inbox/api/sending.py

@@ -1,9 +1,8 @@
 from datetime import datetime
 
-from nylas.logging import get_logger
-
 from inbox.api.err import err
 from inbox.api.kellogs import APIEncoder, encode
+from inbox.logging import get_logger
 from inbox.sendmail.base import SendMailException, get_sendmail_client
 
 log = get_logger()

inbox/api/srv.py

@@ -2,7 +2,6 @@
 from flask.ext.restful import reqparse
 from metrics_api import app as metrics_api
 from ns_api import DEFAULT_LIMIT, app as ns_api
-from nylas.logging import get_logger
 from sqlalchemy.orm.exc import NoResultFound
 from werkzeug.exceptions import HTTPException, default_exceptions
 
@@ -18,6 +17,7 @@
 from inbox.auth.generic import GenericAccountData, GenericAuthHandler
 from inbox.auth.google import GoogleAccountData, GoogleAuthHandler
 from inbox.auth.microsoft import MicrosoftAccountData, MicrosoftAuthHandler
+from inbox.logging import get_logger
 from inbox.models import Account, Namespace
 from inbox.models.backends.generic import GenericAccount
 from inbox.models.backends.gmail import GOOGLE_EMAIL_SCOPE, GmailAccount