From: S.Çağlar Onur Date: Tue, 16 Nov 2010 19:53:13 +0000 (-0500) Subject: cosmetic X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=de29d2f993c9766712510ace97d5e7519a8521f0;p=plcapi.git cosmetic --- diff --git a/PLCAPI.spec b/PLCAPI.spec index de70344b..a330155f 100644 --- a/PLCAPI.spec +++ b/PLCAPI.spec @@ -125,8 +125,8 @@ install -D -m 755 omf/reset_xmpp_pubsub_nodes.py $RPM_BUILD_ROOT/usr/bin/reset_x mkdir -p $RPM_BUILD_ROOT/var/log/omf # Install ratelimit log -touch $RPM_BUILD_ROOT/var/log/api_ratelimit.log -chown apache:apache $RPM_BUILD_ROOT/var/log/api_ratelimit.log +touch $RPM_BUILD_ROOT/var/log/plc_api_ratelimit.log +chown apache:apache $RPM_BUILD_ROOT/var/log/plc_api_ratelimit.log %clean rm -rf $RPM_BUILD_ROOT diff --git a/aspects/ratelimitaspects.py b/aspects/ratelimitaspects.py index fe123faa..78548c23 100644 --- a/aspects/ratelimitaspects.py +++ b/aspects/ratelimitaspects.py @@ -1,8 +1,15 @@ +#!/usr/bin/python +#-*- coding: utf-8 -*- +# +# S.Çağlar Onur + from PLC.Config import Config -from PLC.Faults import * +from PLC.Faults import PLCPermissionDenied from datetime import datetime, timedelta + from pyaspects.meta import MetaAspect + import memcache class BaseRateLimit(object): @@ -46,7 +53,7 @@ class BaseRateLimit(object): total_requests += result[i] if total_requests > self.requests: - log = open("/var/log/api_ratelimit.log", "a") + log = open("/var/log/plc_api_ratelimit.log", "a") date = datetime.now().strftime("%d/%m/%y %H:%M") log.write("%s - %s\n" % (date, api_method_source[0])) log.flush()