From 7699dd288ceaa8cac7186a341b94f0fc4dfbb013 Mon Sep 17 00:00:00 2001 From: Nyo Date: Mon, 31 Oct 2016 09:44:36 +0100 Subject: [PATCH] .BANCHO. Add basic api code --- common | 2 +- handlers/api/__init__.py | 0 handlers/api/ping.py | 7 +++++++ objects/glob.py | 2 ++ pep.py | 6 +++++- 5 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 handlers/api/__init__.py create mode 100644 handlers/api/ping.py diff --git a/common b/common index 97ed79d..4b713cb 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit 97ed79d4a1a721bec3ebfe05f11ffde589f97bd2 +Subproject commit 4b713cbb2854744fcf6f9faabdf6311a35da5209 diff --git a/handlers/api/__init__.py b/handlers/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/handlers/api/ping.py b/handlers/api/ping.py new file mode 100644 index 0000000..b62f8fc --- /dev/null +++ b/handlers/api/ping.py @@ -0,0 +1,7 @@ +from common.web.api import api + +class handler(api.asyncAPIHandler): + @api.api + @api.args("ses") + def asyncGet(self): + self.data["message"] = "狂乱 Hey Kids!!" \ No newline at end of file diff --git a/objects/glob.py b/objects/glob.py index 2997c85..8c0aa0e 100644 --- a/objects/glob.py +++ b/objects/glob.py @@ -4,6 +4,7 @@ import time from common.ddog import datadogClient from common.files import fileBuffer, fileLocks +from common.web.api import rateLimit from objects import channelList from objects import matchList from objects import streamList @@ -50,3 +51,4 @@ startTime = int(time.time()) streams = streamList.streamList() +rateLimits = rateLimit.rateLimiters(60, 60) diff --git a/pep.py b/pep.py index 27b33fd..63684ab 100644 --- a/pep.py +++ b/pep.py @@ -25,6 +25,7 @@ from handlers import apiVerifiedStatusHandler from handlers import ciTriggerHandler from handlers import mainHandler from handlers import heavyHandler +from handlers.api import ping from helpers import configHelper from helpers import consoleHelper from helpers import systemHelper as system @@ -35,6 +36,7 @@ from objects import fokabot from objects import glob + def make_app(): return tornado.web.Application([ (r"/", mainHandler.handler), @@ -44,7 +46,9 @@ def make_app(): (r"/api/v1/ciTrigger", ciTriggerHandler.handler), (r"/api/v1/verifiedStatus", apiVerifiedStatusHandler.handler), (r"/api/v1/fokabotMessage", apiFokabotMessageHandler.handler), - (r"/stress", heavyHandler.handler) + (r"/stress", heavyHandler.handler), + + (r"/api/v2/ping", ping.handler), ]) if __name__ == "__main__":