Skip to content

Commit

Permalink
Added logging
Browse files Browse the repository at this point in the history
  • Loading branch information
romanchyla committed Dec 4, 2015
1 parent e36e6d7 commit 2be657e
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[![Build Status](https://travis-ci.org/adsabs/solr-service.svg?branch=master)](https://travis-ci.org/adsabs/solr-service)
[![Coverage Status](https://coveralls.io/repos/adsabs/solr-service/badge.svg?branch=master)](https://coveralls.io/r/adsabs/solr-service?branch=master)
[![Coverage Status](https://coveralls.io/repos/adsabs/solr-service/badge.svg?branch=master&service=github)](https://coveralls.io/github/adsabs/solr-service?branch=master)

# Microservice responsible for proxying requests to Solr

Expand Down
7 changes: 6 additions & 1 deletion solr/app.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@

import logging.config
from flask import Flask, make_response, jsonify
from views import StatusView, Tvrh, Search, Qtree, BigQuery
from flask.ext.restful import Api
Expand All @@ -15,7 +17,10 @@ def create_app():
app.url_map.strict_slashes = False
Consul(app) # load_config expects consul to be registered
load_config(app)

logging.config.dictConfig(
app.config['SOLR_SERVICE_LOGGING']
)

api = Api(app)

@api.representation('application/json')
Expand Down
32 changes: 32 additions & 0 deletions solr/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,35 @@
SOLR_SERVICE_BIGQUERY_HANDLER = SOLR_SERVICE_URL + '/bigquery'
SOLR_SERVICE_FORWARD_COOKIE_NAME = 'session'
SOLR_SERVICE_DISALLOWED_FIELDS = ['body', 'full', 'reader']

SOLR_SERVICE_LOGGING = {
'version': 1,
'disable_existing_loggers': False,
'formatters': {
'default': {
'format': '%(levelname)s\t%(process)d '
'[%(asctime)s]:\t%(message)s',
'datefmt': '%m/%d/%Y %H:%M:%S',
}
},
'handlers': {
'file': {
'formatter': 'default',
'level': 'INFO',
'class': 'logging.handlers.TimedRotatingFileHandler',
'filename': '/tmp/solr_service.log',
},
'console': {
'formatter': 'default',
'level': 'INFO',
'class': 'logging.StreamHandler'
},
},
'loggers': {
'': {
'handlers': ['file', 'console'],
'level': 'INFO',
'propagate': True,
},
},
}

0 comments on commit 2be657e

Please sign in to comment.