Merge branch 'bobthe'

Conflicts:
	test/data/test.db

config.py

@@ -1,15 +1,16 @@
 import logging
-import os
 import logstash_formatter
 
 from peewee import MySQLDatabase, SqliteDatabase
 from storage.s3 import S3Storage
 from storage.local import LocalStorage
 from data.userfiles import UserRequestFiles
+from data.buildlogs import BuildLogs
 from util import analytics
 
 from test.teststorage import FakeStorage, FakeUserfiles
 from test import analytics as fake_analytics
+from test.testlogs import TestBuildLogs
 
 
 class FlaskConfig(object):
@@ -86,6 +87,15 @@ class S3Userfiles(AWSCredentials):
                                AWSCredentials.REGISTRY_S3_BUCKET)
 
 
+class RedisBuildLogs(object):
+  BUILDLOGS = BuildLogs('logs.quay.io')
+
+
+class TestBuildLogs(object):
+  BUILDLOGS = TestBuildLogs('logs.quay.io', 'devtable', 'building',
+                            'deadbeef-dead-beef-dead-beefdeadbeef')
+
+
 class StripeTestConfig(object):
   STRIPE_SECRET_KEY = 'sk_test_PEbmJCYrLXPW0VRLSnWUiZ7Y'
   STRIPE_PUBLISHABLE_KEY = 'pk_test_uEDHANKm9CHCvVa2DLcipGRh'
@@ -135,13 +145,13 @@ class BuildNodeConfig(object):
   BUILD_NODE_PULL_TOKEN = 'F02O2E86CQLKZUQ0O81J8XDHQ6F0N1V36L9JTOEEK6GKKMT1GI8PTJQT4OU88Y6G'
 
 
-def logs_init_builder(level=logging.DEBUG):
+def logs_init_builder(level=logging.DEBUG,
+                      formatter=logstash_formatter.LogstashFormatter()):
   @staticmethod
   def init_logs():
     handler = logging.StreamHandler()
     root_logger = logging.getLogger('')
     root_logger.setLevel(level)
-    formatter = logstash_formatter.LogstashFormatter()
     handler.setFormatter(formatter)
     root_logger.addHandler(handler)
 
@@ -149,26 +159,25 @@ def logs_init_builder(level=logging.DEBUG):
 
 
 class TestConfig(FlaskConfig, FakeStorage, EphemeralDB, FakeUserfiles,
-                 FakeAnalytics, StripeTestConfig):
+                 FakeAnalytics, StripeTestConfig, RedisBuildLogs):
   LOGGING_CONFIG = logs_init_builder(logging.WARN)
   POPULATE_DB_TEST_DATA = True
   TESTING = True
-  INCLUDE_TEST_ENDPOINTS = True
 
 
 class DebugConfig(FlaskConfig, MailConfig, LocalStorage, SQLiteDB,
                   StripeTestConfig, MixpanelTestConfig, GitHubTestConfig,
-                  DigitalOceanConfig, BuildNodeConfig, S3Userfiles):
-  LOGGING_CONFIG = logs_init_builder()
+                  DigitalOceanConfig, BuildNodeConfig, S3Userfiles,
+                  TestBuildLogs):
+  LOGGING_CONFIG = logs_init_builder(formatter=logging.Formatter())
   SEND_FILE_MAX_AGE_DEFAULT = 0
   POPULATE_DB_TEST_DATA = True
-  INCLUDE_TEST_ENDPOINTS = True
 
 
 class LocalHostedConfig(FlaskConfig, MailConfig, S3Storage, RDSMySQL,
                         StripeLiveConfig, MixpanelTestConfig,
                         GitHubProdConfig, DigitalOceanConfig,
-                        BuildNodeConfig, S3Userfiles):
+                        BuildNodeConfig, S3Userfiles, RedisBuildLogs):
   LOGGING_CONFIG = logs_init_builder()
   SEND_FILE_MAX_AGE_DEFAULT = 0
 
@@ -176,7 +185,7 @@ class LocalHostedConfig(FlaskConfig, MailConfig, S3Storage, RDSMySQL,
 class ProductionConfig(FlaskProdConfig, MailConfig, S3Storage, RDSMySQL,
                        StripeLiveConfig, MixpanelProdConfig,
                        GitHubProdConfig, DigitalOceanConfig, BuildNodeConfig,
-                       S3Userfiles):
+                       S3Userfiles, RedisBuildLogs):
 
   LOGGING_CONFIG = logs_init_builder()
   SEND_FILE_MAX_AGE_DEFAULT = 0