openstack/deb-murano
Code Issues Proposed changes

Merge "statistics renamed to request_statistics"

Browse Source
This commit is contained in:
Jenkins 2014-04-03 09:16:08 +00:00 committed by Gerrit Code Review
commit 976b6813e9
7 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
muranoapi/api/v1/deployments.py
View File

@ -14,7 +14,7 @@
from sqlalchemy import desc from sqlalchemy import desc
from webob import exc from webob import exc
from muranoapi.api.v1 import statistics from muranoapi.api.v1 import request_statistics
from muranoapi.common import utils from muranoapi.common import utils
from muranoapi.db import models from muranoapi.db import models
from muranoapi.db import session as db_session from muranoapi.db import session as db_session
@ -29,7 +29,7 @@ API_NAME = 'Deployments'
class Controller(object): class Controller(object):
@statistics.stats_count(API_NAME, 'Index') @request_statistics.stats_count(API_NAME, 'Index')
def index(self, request, environment_id): def index(self, request, environment_id):
unit = db_session.get_session() unit = db_session.get_session()
verify_and_get_env(unit, environment_id, request) verify_and_get_env(unit, environment_id, request)
@ -41,7 +41,7 @@ class Controller(object):
in result] in result]
return {'deployments': deployments} return {'deployments': deployments}
@statistics.stats_count(API_NAME, 'Statuses') @request_statistics.stats_count(API_NAME, 'Statuses')
def statuses(self, request, environment_id, deployment_id): def statuses(self, request, environment_id, deployment_id):
unit = db_session.get_session() unit = db_session.get_session()
query = unit.query(models.Status) \ query = unit.query(models.Status) \

14
muranoapi/api/v1/environments.py
View File

@ -15,7 +15,7 @@
from sqlalchemy import desc from sqlalchemy import desc
from webob import exc from webob import exc
from muranoapi.api.v1 import statistics from muranoapi.api.v1 import request_statistics
from muranoapi.common import utils from muranoapi.common import utils
from muranoapi.db import models from muranoapi.db import models
from muranoapi.db.services import core_services from muranoapi.db.services import core_services
@ -33,7 +33,7 @@ API_NAME = 'Environments'
class Controller(object): class Controller(object):
@statistics.stats_count(API_NAME, 'Index') @request_statistics.stats_count(API_NAME, 'Index')
def index(self, request): def index(self, request):
LOG.debug(_('Environments:List')) LOG.debug(_('Environments:List'))
@ -44,7 +44,7 @@ class Controller(object):
return {"environments": environments} return {"environments": environments}
@statistics.stats_count(API_NAME, 'Create') @request_statistics.stats_count(API_NAME, 'Create')
def create(self, request, body): def create(self, request, body):
LOG.debug(_('Environments:Create <Body {0}>'.format(body))) LOG.debug(_('Environments:Create <Body {0}>'.format(body)))
@ -53,7 +53,7 @@ class Controller(object):
return environment.to_dict() return environment.to_dict()
@statistics.stats_count(API_NAME, 'Show') @request_statistics.stats_count(API_NAME, 'Show')
def show(self, request, environment_id): def show(self, request, environment_id):
LOG.debug(_('Environments:Show <Id: {0}>'.format(environment_id))) LOG.debug(_('Environments:Show <Id: {0}>'.format(environment_id)))
@ -83,7 +83,7 @@ class Controller(object):
return env return env
@statistics.stats_count(API_NAME, 'Update') @request_statistics.stats_count(API_NAME, 'Update')
def update(self, request, environment_id, body): def update(self, request, environment_id, body):
LOG.debug(_('Environments:Update <Id: {0}, ' LOG.debug(_('Environments:Update <Id: {0}, '
'Body: {1}>'.format(environment_id, body))) 'Body: {1}>'.format(environment_id, body)))
@ -106,7 +106,7 @@ class Controller(object):
return environment.to_dict() return environment.to_dict()
@statistics.stats_count(API_NAME, 'Delete') @request_statistics.stats_count(API_NAME, 'Delete')
def delete(self, request, environment_id): def delete(self, request, environment_id):
LOG.debug(_('Environments:Delete <Id: {0}>'.format(environment_id))) LOG.debug(_('Environments:Delete <Id: {0}>'.format(environment_id)))
@ -126,7 +126,7 @@ class Controller(object):
envs.EnvironmentServices.delete(environment_id, envs.EnvironmentServices.delete(environment_id,
request.context.auth_token) request.context.auth_token)
@statistics.stats_count(API_NAME, 'LastStatus') @request_statistics.stats_count(API_NAME, 'LastStatus')
def last(self, request, environment_id): def last(self, request, environment_id):
session_id = None session_id = None
if hasattr(request, 'context') and request.context.session: if hasattr(request, 'context') and request.context.session:

4
muranoapi/api/v1/statistics.py → muranoapi/api/v1/request_statistics.py
View File

@ -20,7 +20,7 @@ from muranoapi.openstack.common import log as logging
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
class StatisticsCollection(object): class RequestStatisticsCollection(object):
request_count = 0 request_count = 0
error_count = 0 error_count = 0
average_time = 0.0 average_time = 0.0
@ -85,4 +85,4 @@ def update_error_count(api, method, ex_time, tenant=None):
def init_stats(): def init_stats():
if not v1.stats: if not v1.stats:
v1.stats = StatisticsCollection() v1.stats = RequestStatisticsCollection()

10
muranoapi/api/v1/services.py
View File

@ -16,7 +16,7 @@ import functools as func
from webob import exc from webob import exc
from muranoapi.api.v1 import statistics from muranoapi.api.v1 import request_statistics
from muranoapi.common.helpers import token_sanitizer from muranoapi.common.helpers import token_sanitizer
from muranoapi.db.services import core_services from muranoapi.db.services import core_services
from muranoapi.openstack.common.gettextutils import _ # noqa from muranoapi.openstack.common.gettextutils import _ # noqa
@ -44,7 +44,7 @@ def normalize_path(f):
class Controller(object): class Controller(object):
@statistics.stats_count(API_NAME, 'Index') @request_statistics.stats_count(API_NAME, 'Index')
@utils.verify_env @utils.verify_env
@normalize_path @normalize_path
def get(self, request, environment_id, path): def get(self, request, environment_id, path):
@ -63,7 +63,7 @@ class Controller(object):
raise exc.HTTPNotFound raise exc.HTTPNotFound
return result return result
@statistics.stats_count(API_NAME, 'Create') @request_statistics.stats_count(API_NAME, 'Create')
@utils.verify_session @utils.verify_session
@utils.verify_env @utils.verify_env
@normalize_path @normalize_path
@ -80,7 +80,7 @@ class Controller(object):
raise exc.HTTPNotFound raise exc.HTTPNotFound
return result return result
@statistics.stats_count(API_NAME, 'Update') @request_statistics.stats_count(API_NAME, 'Update')
@utils.verify_session @utils.verify_session
@utils.verify_env @utils.verify_env
@normalize_path @normalize_path
@ -97,7 +97,7 @@ class Controller(object):
raise exc.HTTPNotFound raise exc.HTTPNotFound
return result return result
@statistics.stats_count(API_NAME, 'Delete') @request_statistics.stats_count(API_NAME, 'Delete')
@utils.verify_session @utils.verify_session
@utils.verify_env @utils.verify_env
@normalize_path @normalize_path

10
muranoapi/api/v1/sessions.py
View File

@ -14,7 +14,7 @@
from webob import exc from webob import exc
from muranoapi.api.v1 import statistics from muranoapi.api.v1 import request_statistics
from muranoapi.db import models from muranoapi.db import models
from muranoapi.db.services import environments as envs from muranoapi.db.services import environments as envs
from muranoapi.db.services import sessions from muranoapi.db.services import sessions
@ -30,7 +30,7 @@ API_NAME = 'Sessions'
class Controller(object): class Controller(object):
@statistics.stats_count(API_NAME, 'Create') @request_statistics.stats_count(API_NAME, 'Create')
def configure(self, request, environment_id): def configure(self, request, environment_id):
LOG.debug(_('Session:Configure <EnvId: {0}>'.format(environment_id))) LOG.debug(_('Session:Configure <EnvId: {0}>'.format(environment_id)))
@ -60,7 +60,7 @@ class Controller(object):
return session.to_dict() return session.to_dict()
@statistics.stats_count(API_NAME, 'Index') @request_statistics.stats_count(API_NAME, 'Index')
def show(self, request, environment_id, session_id): def show(self, request, environment_id, session_id):
LOG.debug(_('Session:Show <SessionId: {0}>'.format(session_id))) LOG.debug(_('Session:Show <SessionId: {0}>'.format(session_id)))
@ -90,7 +90,7 @@ class Controller(object):
return session.to_dict() return session.to_dict()
@statistics.stats_count(API_NAME, 'Delete') @request_statistics.stats_count(API_NAME, 'Delete')
def delete(self, request, environment_id, session_id): def delete(self, request, environment_id, session_id):
LOG.debug(_('Session:Delete <SessionId: {0}>'.format(session_id))) LOG.debug(_('Session:Delete <SessionId: {0}>'.format(session_id)))
@ -123,7 +123,7 @@ class Controller(object):
return None return None
@statistics.stats_count(API_NAME, 'Deploy') @request_statistics.stats_count(API_NAME, 'Deploy')
def deploy(self, request, environment_id, session_id): def deploy(self, request, environment_id, session_id):
LOG.debug(_('Session:Deploy <SessionId: {0}>'.format(session_id))) LOG.debug(_('Session:Deploy <SessionId: {0}>'.format(session_id)))

4
muranoapi/cmd/api.py
View File

@ -26,7 +26,7 @@ root = os.path.join(os.path.abspath(__file__), os.pardir, os.pardir, os.pardir)
if os.path.exists(os.path.join(root, 'muranoapi', '__init__.py')): if os.path.exists(os.path.join(root, 'muranoapi', '__init__.py')):
sys.path.insert(0, root) sys.path.insert(0, root)
from muranoapi.api.v1 import statistics from muranoapi.api.v1 import request_statistics
from muranoapi.common import config from muranoapi.common import config
from muranoapi.common import server from muranoapi.common import server
from muranoapi.common import statservice as stats from muranoapi.common import statservice as stats
@ -39,7 +39,7 @@ def main():
try: try:
config.parse_args() config.parse_args()
log.setup('muranoapi') log.setup('muranoapi')
statistics.init_stats() request_statistics.init_stats()
launcher = service.ServiceLauncher() launcher = service.ServiceLauncher()

4
muranoapi/common/statservice.py
View File

@ -18,7 +18,7 @@ import socket
import time import time
from muranoapi.api import v1 from muranoapi.api import v1
from muranoapi.api.v1 import statistics from muranoapi.api.v1 import request_statistics
from muranoapi.common import config from muranoapi.common import config
from muranoapi.db.services import stats as db_stats from muranoapi.db.services import stats as db_stats
@ -34,7 +34,7 @@ LOG = logging.getLogger(__name__)
class StatsCollectingService(service.Service): class StatsCollectingService(service.Service):
def __init__(self): def __init__(self):
super(StatsCollectingService, self).__init__() super(StatsCollectingService, self).__init__()
statistics.init_stats() request_statistics.init_stats()
self._hostname = socket.gethostname() self._hostname = socket.gethostname()
self._stats_db = db_stats.Statistics() self._stats_db = db_stats.Statistics()
self._prev_time = time.time() self._prev_time = time.time()