From 46725066a56dc4d08cc03b1ea394e21ec449a80f Mon Sep 17 00:00:00 2001 From: schneefux Date: Sat, 15 Apr 2017 21:43:02 +0200 Subject: 2.0.0 beta --- .gitmodules | 30 ++++++++++------- README.md | 12 +++---- analyzer | 2 +- apigrabber | 2 +- bridge | 1 + compiler | 1 - cruncher | 2 +- discordbot | 2 +- docs | 1 + orm | 1 + preloader | 1 - processor | 2 +- supervisord.conf.example | 87 ------------------------------------------------ updater | 1 - vaindock | 2 +- vainsocial | 2 +- 16 files changed, 33 insertions(+), 116 deletions(-) create mode 160000 bridge delete mode 160000 compiler create mode 160000 docs create mode 160000 orm delete mode 160000 preloader delete mode 100644 supervisord.conf.example delete mode 160000 updater diff --git a/.gitmodules b/.gitmodules index 58640a5..f6bbbc5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,36 +1,42 @@ [submodule "apigrabber"] path = apigrabber url = https://gitlab.com/vainglorygame/apigrabber.git + branch = releases/2.0.0 [submodule "processor"] path = processor url = https://gitlab.com/vainglorygame/processor.git -[submodule "compiler"] - path = compiler - url = https://gitlab.com/vainglorygame/compiler.git + branch = releases/2.0.0 [submodule "discordbot"] path = discordbot url = https://gitlab.com/vainglorygame/discordbot.git -[submodule "preloader"] - path = preloader - url = https://gitlab.com/vainglorygame/preloader.git + branch = releases/2.0.0 [submodule "vaindock"] path = vaindock url = https://gitlab.com/vainglorygame/vaindock.git + branch = releases/2.0.0 [submodule "vainsocial"] path = vainsocial url = https://gitlab.com/vainglorygame/vainsocial.git + branch = releases/2.0.0 [submodule "vainglorygame.github.io"] path = vainglorygame.github.io url = https://gitlab.com/vainglorygame/vainglorygame.github.io.git [submodule "analyzer"] path = analyzer url = https://gitlab.com/vainglorygame/analyzer.git + branch = releases/2.0.0 [submodule "cruncher"] path = cruncher url = https://gitlab.com/vainglorygame/cruncher.git -[submodule "minionlivesmatter"] - path = minionlivesmatter - url = https://gitlab.com/vainglorygame/minionlivesmatter.git -[submodule "updater"] - path = updater - url = https://gitlab.com/vainglorygame/updater.git + branch = releases/2.0.0 +[submodule "bridge"] + path = bridge + url = https://gitlab.com/vainglorygame/bridge.git + branch = releases/2.0.0 +[submodule "docs"] + path = docs + url = https://gitlab.com/vainglorygame/docs.git +[submodule "orm"] + path = orm + url = https://gitlab.com/vainglorygame/orm.git + branch = releases/2.0.0 diff --git a/README.md b/README.md index c947820..55c1b44 100644 --- a/README.md +++ b/README.md @@ -3,15 +3,13 @@ Overview * apigrabber: microservice to fetch data from API * processor: microservice to insert data into database - * compiler: microservice to calculate simple statistics - * analyzer: microservice to calculate using machine learning - * cruncher: microservice to calculate service-wide statistics - * preloader: microservice to prefetch matches for players that users are likely to view - * updater: microservice for communication between frontend and backend + * cruncher: microservice to calculate statistics + * analyzer: machine learning tool + * bridge: microservice for communication between frontend and backend * vainsocial: web frontend * discordbot: Discord frontend - * minionlivesmatter: fun frontend - * vainglorygame.github.io: out-of-date documentation repository + * vainglorygame.github.io: documentation repository + * docs: more documentation * vaindock: Docker containers for services, databases and everything else Setup diff --git a/analyzer b/analyzer index 3d52234..c21015d 160000 --- a/analyzer +++ b/analyzer @@ -1 +1 @@ -Subproject commit 3d52234edae83971e5df58f65f91c95e0352ed3f +Subproject commit c21015de0966635d6fc651d7906ff258e6036b36 diff --git a/apigrabber b/apigrabber index 60a8aac..3785ed8 160000 --- a/apigrabber +++ b/apigrabber @@ -1 +1 @@ -Subproject commit 60a8aac5f7acc61432fc6a59843e2c91d5df6a35 +Subproject commit 3785ed862accad4c8f8b7e719d86aabb0506e36d diff --git a/bridge b/bridge new file mode 160000 index 0000000..9f974a3 --- /dev/null +++ b/bridge @@ -0,0 +1 @@ +Subproject commit 9f974a33bf15b27b7c94117de1cc993fa197e41f diff --git a/compiler b/compiler deleted file mode 160000 index 74c9755..0000000 --- a/compiler +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74c975556c0e067e60f99fb96d64d973210bf786 diff --git a/cruncher b/cruncher index e70dad6..127ab8e 160000 --- a/cruncher +++ b/cruncher @@ -1 +1 @@ -Subproject commit e70dad61caefd3f85c29f30798cd1472e03cb4cf +Subproject commit 127ab8e6282911453220e7a21f06869ecacaab6c diff --git a/discordbot b/discordbot index 291cf50..ab3e746 160000 --- a/discordbot +++ b/discordbot @@ -1 +1 @@ -Subproject commit 291cf5046f1497c49b0266d0d818882a2b96d5d4 +Subproject commit ab3e74687ae926c48f3e13e3eb0703af8e0d3961 diff --git a/docs b/docs new file mode 160000 index 0000000..4d079db --- /dev/null +++ b/docs @@ -0,0 +1 @@ +Subproject commit 4d079db3d82618e2fdcd7eef71cc93fd95748c3b diff --git a/orm b/orm new file mode 160000 index 0000000..d95b8a5 --- /dev/null +++ b/orm @@ -0,0 +1 @@ +Subproject commit d95b8a5f1708463715e9e86b0121089b49c362bb diff --git a/preloader b/preloader deleted file mode 160000 index b67e2bf..0000000 --- a/preloader +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b67e2bffc3e7f30487dfc693238059dfaa1fd784 diff --git a/processor b/processor index c393152..acb9013 160000 --- a/processor +++ b/processor @@ -1 +1 @@ -Subproject commit c393152d1f84fc19a0d04c91d7d545c89a7d3693 +Subproject commit acb90130558e267c8f49ed8e6835c9242214b3ee diff --git a/supervisord.conf.example b/supervisord.conf.example deleted file mode 100644 index c770de2..0000000 --- a/supervisord.conf.example +++ /dev/null @@ -1,87 +0,0 @@ -[supervisorctl] -serverurl=unix:///var/run/supervisor.sock - -[program:vainsocial-apigrabber] -user=vainsocial -command=/vainsocial/apigrabber/venv/bin/python /vainsocial/apigrabber/api.py -redirect_stderr=true -stdout_logfile=/vainsocial/logs/apigrabber.log -environment= - VAINSOCIAL_APITOKEN=, - POSTGRESQL_HOST=, - POSTGRESQL_PORT=5433, - POSTGRESQL_DB=vain_raw, - POSTGRESQL_USER=vainraw, - POSTGRESQL_PASSWORD= - - -[program:vainsocial-preloader] -user=vainsocial -command=/vainsocial/preloader/venv/bin/python /vainsocial/preloader/api.py -redirect_stderr=true -stdout_logfile=/vainsocial/logs/preloader.log -environment= - VAINSOCIAL_APITOKEN=, - VAINSOCIAL_SPIDERTHROTTLE=1, - POSTGRESQL_HOST=, - POSTGRESQL_PORT=5433, - POSTGRESQL_DB=vain_raw, - POSTGRESQL_USER=vainraw, - POSTGRESQL_PASSWORD= - - -[program:vainsocial-processor] -user=vainsocial -command=/vainsocial/processor/venv/bin/python /vainsocial/processor/api.py -redirect_stderr=true -stdout_logfile=/vainsocial/logs/processor.log -environment= - VAINSOCIAL_SPIDER="true", - VAINSOCIAL_ANALYZE="false", - POSTGRESQL_SOURCE_HOST=, - POSTGRESQL_SOURCE_PORT=5433, - POSTGRESQL_SOURCE_DB=vain_raw, - POSTGRESQL_SOURCE_USER=vainraw, - POSTGRESQL_SOURCE_PASSWORD=, - POSTGRESQL_DEST_HOST=, - POSTGRESQL_DEST_PORT=5433, - POSTGRESQL_DEST_DB=vain_web, - POSTGRESQL_DEST_USER=vainweb, - POSTGRESQL_DEST_PASSWORD= - - -[program:vainsocial-compiler] -user=vainsocial -command=/vainsocial/statscompiler/venv/bin/python /vainsocial/statscompiler/api.py -redirect_stderr=true -stdout_logfile=/vainsocial/logs/compiler.log -environment= - POSTGRESQL_SOURCE_HOST=, - POSTGRESQL_SOURCE_PORT=5433, - POSTGRESQL_SOURCE_DB=vain_raw, - POSTGRESQL_SOURCE_USER=vainraw, - POSTGRESQL_SOURCE_PASSWORD=, - POSTGRESQL_DEST_HOST=, - POSTGRESQL_DEST_PORT=5433, - POSTGRESQL_DEST_DB=vain_web, - POSTGRESQL_DEST_USER=vainweb, - POSTGRESQL_DEST_PASSWORD= - - -[program:vainsocial-discordbot] -user=vainsocial -command=/vainsocial/discordbot/venv/bin/python /vainsocial/discordbot/main.py -redirect_stderr=true -stdout_logfile=/vainsocial/logs/discordbot.log -environment= - VAINSOCIAL_DISCORDTOKEN="", - POSTGRESQL_SOURCE_HOST=, - POSTGRESQL_SOURCE_PORT=5433, - POSTGRESQL_SOURCE_DB=vain_raw, - POSTGRESQL_SOURCE_USER=vainraw, - POSTGRESQL_SOURCE_PASSWORD=, - POSTGRESQL_DEST_HOST=, - POSTGRESQL_DEST_PORT=5433, - POSTGRESQL_DEST_DB=vain_web, - POSTGRESQL_DEST_USER=vainweb, - POSTGRESQL_DEST_PASSWORD= diff --git a/updater b/updater deleted file mode 160000 index d830686..0000000 --- a/updater +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d830686ced729dc37b05293353d838e697dcf60a diff --git a/vaindock b/vaindock index 5cce35f..93a6a21 160000 --- a/vaindock +++ b/vaindock @@ -1 +1 @@ -Subproject commit 5cce35f75ba8b42ecbc3debebbe6db7503500753 +Subproject commit 93a6a2164ead33b9ae59781a479d3196fa95d014 diff --git a/vainsocial b/vainsocial index ef97759..a4c8961 160000 --- a/vainsocial +++ b/vainsocial @@ -1 +1 @@ -Subproject commit ef97759b6fb6017fbc7147b8702fa765a6368de8 +Subproject commit a4c896194f67c4071e0784fe99862a2e906924c0 -- cgit v1.3.1