From c4f66e380afc51d7add12aec8b4bfdcbf7630656 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 4 Nov 2015 23:35:43 +0000 Subject: [PATCH 01/12] Hotfix for Issue #89 Reworked logic to prevent comparison of NoneType alliance ID --- celerytask/tasks.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 45f758e9..6d78adb6 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -428,10 +428,15 @@ def run_corp_update(): # Remove irrelevent corp and alliance models # Check the corps for all_corp_info in EveManager.get_all_corporation_info(): - if (settings.IS_CORP and all_corp_info.corporation_id != settings.CORP_ID) or (not settings.IS_CORP and all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID): + if settings.IS_CORP: + if all_corp_info.corporation_id != settings.CORP_ID: + if not all_corp_info.is_blue: + all_corp_info.delete() + elif all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: if not all_corp_info.is_blue: all_corp_info.delete() + # Check the alliances for all_alliance_info in EveManager.get_all_alliance_info(): if (not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID): From fd70fb8f0323a3618132bd98c2800443d17b4804 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 4 Nov 2015 23:45:00 +0000 Subject: [PATCH 02/12] Revision of hotfix for Issue #89 ensures alliance model exists before checking ID --- celerytask/tasks.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 6d78adb6..af1a01df 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -432,9 +432,10 @@ def run_corp_update(): if all_corp_info.corporation_id != settings.CORP_ID: if not all_corp_info.is_blue: all_corp_info.delete() - elif all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: - if not all_corp_info.is_blue: - all_corp_info.delete() + elif all_corp_info.alliance is not None: + if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: + if not all_corp_info.is_blue: + all_corp_info.delete() # Check the alliances From 0420bfb494c48241c0ce7ef2b33e53bc9ca7b6b4 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Thu, 5 Nov 2015 02:25:12 +0000 Subject: [PATCH 03/12] improved handling of corp/alliance model deletion --- celerytask/tasks.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index af1a01df..2ffc9a1a 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -432,14 +432,16 @@ def run_corp_update(): if all_corp_info.corporation_id != settings.CORP_ID: if not all_corp_info.is_blue: all_corp_info.delete() - elif all_corp_info.alliance is not None: - if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: - if not all_corp_info.is_blue: - all_corp_info.delete() - + else: + if all_corp_info.alliance is not None: + if all_corp_info.alliance.alliance_id != settings.ALLIANCE_ID: + if not all_corp_info.is_blue: + all_corp_info.delete() + elif not all_corp_info.is_blue: + all_corp_info.delete() # Check the alliances for all_alliance_info in EveManager.get_all_alliance_info(): - if (not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID): + if not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID: if all_alliance_info.is_blue is not True: all_alliance_info.delete() From cf634d77a4e62926926c50958840d82952469b0d Mon Sep 17 00:00:00 2001 From: Adarnof Date: Thu, 5 Nov 2015 04:16:14 +0000 Subject: [PATCH 04/12] improved alliance model deletion logic --- celerytask/tasks.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 2ffc9a1a..8ef9ce7d 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -442,6 +442,13 @@ def run_corp_update(): # Check the alliances for all_alliance_info in EveManager.get_all_alliance_info(): - if not settings.IS_CORP and all_alliance_info.alliance_id != settings.ALLIANCE_ID: + if settings.IS_CORP: + if all_alliance_info.is_blue is not True: + if corpinfo.alliance is not None: + if all_alliance_info.alliance_id != corpinfo.alliance.alliance_id: + all_alliance_info.delete() + else: + all_alliance_info.delete() + elif all_alliance_info.alliance_id != settings.ALLIANCE_ID: if all_alliance_info.is_blue is not True: all_alliance_info.delete() From f9ce0ff7c0b785a42800282c8c8419931c105d1b Mon Sep 17 00:00:00 2001 From: Brett Costabile Date: Thu, 5 Nov 2015 20:16:11 -0500 Subject: [PATCH 05/12] Postgres Added lines to try and get posrgresql installed for testing. Changed the required version of django back to 1.6.5 because 1.7.0 should not be in production. --- requirements.txt | 4 +++- vagrant/Vagrantfile | 7 ++++++- vagrant/bootstrap.sh | 24 ++++++++++++++++++++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 29f6b32c..41f248ad 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,7 @@ # Python Stuff # - see bootstrap.sh mysql-python +mysqlclient +psycopg2 evelink dnspython passlib @@ -7,7 +9,7 @@ xmpppy==0.5.0rc1 # python-openfire==0.2.3-beta # Django Stuff # -django==1.7.0 +django==1.6.5 django-evolution django-bootstrap-form django-celery diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 91d29ec3..938bdca5 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -16,7 +16,12 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # CD to install its guest extension from. # Create a forwarded port mapping which allows access to a specific port - # within the machine from a port on the host machine. + # within the machine from a port on the host machine. + config.vm.provider "virtualbox" do |v| + v.memory = 1024 + v.cpus = 2 + end + config.vm.network :forwarded_port, guest: 3306, host: 3306 config.vm.network :forwarded_port, guest: 9090, host: 9090 config.vm.network :forwarded_port, guest: 8000, host: 8000 diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index b933faf5..14188278 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -1,4 +1,5 @@ #!/usr/bin/env bash +export DEBIAN_FRONTEND=noninteractive sudo add-apt-repository ppa:upubuntu-com/xampp @@ -10,16 +11,31 @@ sudo apt-get -y install libtool sudo apt-get -y install git sudo apt-get -y install python-dev libyaml-dev libffi-dev sudo apt-get -y install python-pip -sudo apt-get -y install mysql-server mysql-client +sudo apt-get -y install mysql-server mysql-client libmysqlclient-dev #Python 3 stuff sudo apt-get -y install python-software-properties sudo add-apt-repository ppa:fkrull/deadsnakes sudo apt-get -y update -sudo apt-get -y install python3.3 +sudo apt-get -y install python3.4 #virtualenv stuff sudo apt-get -y install python-virtualenv +sudo virtualenv -p /usr/bin/python3.4 /opt/allianceVenv + +#Postgresql stuff +sudo apt-get -y postgresql-9.1 libpq5 libpq-dev postgresql-client-9.1 postgresql-common ssl-cert postgresql-contrib-9.1 postgresql-server-dev-9.1 +sudo apt-get -y install -f +cat << EOF | su - postgres -c psql +-- Create database user: +CREATE USER vagrant WITH PASSWORD 'password'; +GRANT ALL PRIVILEGES ON DATABASE alliance% to vagrant; +EOF +createdb alliance_auth +createdb alliance_forum +createdb alliance_jabber +createdb alliance_mumble +createdb alliance_killboard cd /vagrant/ @@ -28,8 +44,6 @@ sudo pip install --upgrade pip # Pip moved location after upgrade from 1.0 sudo ln -s /usr/local/bin/pip /usr/bin/pip 2>/dev/null -sudo apt-get -y install libmysqlclient-dev - sudo pip install --allow-external mysql-connector-python mysql-connector-python sudo pip install --allow-external python-openfire python-openfire==0.2.3-beta sudo pip install https://github.com/eve-val/evelink/zipball/master @@ -60,7 +74,9 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges sudo apt-get -y install rabbitmq-server +source /opt/allianceVenv/bin/activate sudo pip install -r requirements.txt +deactivate chmod +x *.sh From 0f19d9572350fecfdc9cd8d6728ade9a944af634 Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sat, 14 Nov 2015 09:58:22 +0000 Subject: [PATCH 06/12] Corrected nested loop in run_corp_update --- celerytask/tasks.py | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 8c7f8717..db78f88b 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -367,23 +367,19 @@ def run_corp_update(): blue_info['ticker'], blue_info['members']['current'], True, blue_alliance) - # Update all allinace info's - for all_alliance_info in EveManager.get_all_alliance_info(): - all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) - if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): - EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - elif standing_level in corp_standings: - if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], True) - else: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) + # Update all allinace info's + for all_alliance_info in EveManager.get_all_alliance_info(): + all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) + if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): + EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) + elif standing_level in corp_standings: + if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], True) else: EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], @@ -392,38 +388,42 @@ def run_corp_update(): EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], all_alliance_api_info['member_count'], False) + else: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) - # Update corp infos - for all_corp_info in EveManager.get_all_corporation_info(): - alliance = None - corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) - if corpinfo['alliance']['id'] is not None: - alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) + # Update corp infos + for all_corp_info in EveManager.get_all_corporation_info(): + alliance = None + corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) + if corpinfo['alliance']['id'] is not None: + alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) - if alliance is not None and all_corp_info.alliance is not None: + if alliance is not None and all_corp_info.alliance is not None: - if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) - elif int(alliance.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(alliance.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - True) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - False) + if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) + elif int(alliance.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(alliance.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + True) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) else: - if int(all_corp_info.corporation_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + False) + else: + if int(all_corp_info.corporation_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) # Remove irrelevent corp and alliance models # Check the corps From d8f4cfb3c989f1d5297cf63730809c6148fb6bfb Mon Sep 17 00:00:00 2001 From: Adarnof Date: Wed, 18 Nov 2015 03:56:28 +0000 Subject: [PATCH 07/12] Corrected logic for handling no standings --- celerytask/tasks.py | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index 8ef9ce7d..db78f88b 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -367,19 +367,23 @@ def run_corp_update(): blue_info['ticker'], blue_info['members']['current'], True, blue_alliance) - # Update all allinace info's - for all_alliance_info in EveManager.get_all_alliance_info(): - all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) - if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): - EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - elif standing_level in corp_standings: - if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], True) + # Update all allinace info's + for all_alliance_info in EveManager.get_all_alliance_info(): + all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) + if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): + EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) + elif standing_level in corp_standings: + if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], True) + else: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) else: EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], @@ -388,42 +392,38 @@ def run_corp_update(): EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], all_alliance_api_info['member_count'], False) - else: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - # Update corp infos - for all_corp_info in EveManager.get_all_corporation_info(): - alliance = None - corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) - if corpinfo['alliance']['id'] is not None: - alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) + # Update corp infos + for all_corp_info in EveManager.get_all_corporation_info(): + alliance = None + corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) + if corpinfo['alliance']['id'] is not None: + alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) - if alliance is not None and all_corp_info.alliance is not None: + if alliance is not None and all_corp_info.alliance is not None: - if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) - elif int(alliance.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(alliance.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - True) + if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) + elif int(alliance.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(alliance.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - False) - else: - if int(all_corp_info.corporation_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + if int(all_corp_info.corporation_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) # Remove irrelevent corp and alliance models # Check the corps From 57a1c6aaaa035802b289ae91c6ba8165afa73dc2 Mon Sep 17 00:00:00 2001 From: Brett Costabile Date: Wed, 18 Nov 2015 23:08:59 -0500 Subject: [PATCH 08/12] Removed experimental setup Alot of my experimental stuff for postgresql was causing issues, so I'm removing that for a different project. This way I can get a clean setup out. --- requirements.txt | 1 - vagrant/bootstrap.sh | 28 +--------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) diff --git a/requirements.txt b/requirements.txt index 480ae4e6..7f6251f2 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,6 @@ # Python Stuff # - see bootstrap.sh mysql-python mysqlclient -psycopg2 evelink dnspython passlib diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 14188278..f6015bb4 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -13,30 +13,6 @@ sudo apt-get -y install python-dev libyaml-dev libffi-dev sudo apt-get -y install python-pip sudo apt-get -y install mysql-server mysql-client libmysqlclient-dev -#Python 3 stuff -sudo apt-get -y install python-software-properties -sudo add-apt-repository ppa:fkrull/deadsnakes -sudo apt-get -y update -sudo apt-get -y install python3.4 - -#virtualenv stuff -sudo apt-get -y install python-virtualenv -sudo virtualenv -p /usr/bin/python3.4 /opt/allianceVenv - -#Postgresql stuff -sudo apt-get -y postgresql-9.1 libpq5 libpq-dev postgresql-client-9.1 postgresql-common ssl-cert postgresql-contrib-9.1 postgresql-server-dev-9.1 -sudo apt-get -y install -f -cat << EOF | su - postgres -c psql --- Create database user: -CREATE USER vagrant WITH PASSWORD 'password'; -GRANT ALL PRIVILEGES ON DATABASE alliance% to vagrant; -EOF -createdb alliance_auth -createdb alliance_forum -createdb alliance_jabber -createdb alliance_mumble -createdb alliance_killboard - cd /vagrant/ sudo pip install --upgrade pip @@ -65,7 +41,7 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_jabber sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_mumble sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_killboard -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceauth'@'localhost' IDENTIFIED BY 'allianceauth'" +sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'password'" sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceauth'@'localhost'"; sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'alliancemumble'@'localhost' IDENTIFIED BY 'alliancemumble'" sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'alliancemumble'@'localhost'"; @@ -74,9 +50,7 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges sudo apt-get -y install rabbitmq-server -source /opt/allianceVenv/bin/activate sudo pip install -r requirements.txt -deactivate chmod +x *.sh From 8a6c244e67b50ae91334e6337265248f88547ffc Mon Sep 17 00:00:00 2001 From: Brett Costabile Date: Wed, 18 Nov 2015 23:24:56 -0500 Subject: [PATCH 09/12] corrected username missed that line --- vagrant/bootstrap.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index f6015bb4..a7ded303 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -42,7 +42,7 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_mumble sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_killboard sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'password'" -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceauth'@'localhost'"; +sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceserver'@'localhost'"; sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'alliancemumble'@'localhost' IDENTIFIED BY 'alliancemumble'" sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'alliancemumble'@'localhost'"; From b36890ea9b74e8186a4ba1dffb6c3987fb1fe7fe Mon Sep 17 00:00:00 2001 From: Adarnof Date: Thu, 19 Nov 2015 05:35:39 +0000 Subject: [PATCH 10/12] Moved alliance/corp blue status update logic within block verifying corp standings exist --- celerytask/tasks.py | 80 ++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/celerytask/tasks.py b/celerytask/tasks.py index db78f88b..8c7f8717 100755 --- a/celerytask/tasks.py +++ b/celerytask/tasks.py @@ -367,19 +367,23 @@ def run_corp_update(): blue_info['ticker'], blue_info['members']['current'], True, blue_alliance) - # Update all allinace info's - for all_alliance_info in EveManager.get_all_alliance_info(): - all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) - if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): - EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - elif standing_level in corp_standings: - if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], True) + # Update all allinace info's + for all_alliance_info in EveManager.get_all_alliance_info(): + all_alliance_api_info = EveApiManager.get_alliance_information(all_alliance_info.alliance_id) + if (not settings.IS_CORP and all_alliance_info.alliance_id == settings.ALLIANCE_ID): + EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) + elif standing_level in corp_standings: + if int(all_alliance_info.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_alliance_info.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], True) + else: + EveManager.update_alliance_info(all_alliance_api_info['id'], + all_alliance_api_info['executor_id'], + all_alliance_api_info['member_count'], False) else: EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], @@ -388,42 +392,38 @@ def run_corp_update(): EveManager.update_alliance_info(all_alliance_api_info['id'], all_alliance_api_info['executor_id'], all_alliance_api_info['member_count'], False) - else: - EveManager.update_alliance_info(all_alliance_api_info['id'], - all_alliance_api_info['executor_id'], - all_alliance_api_info['member_count'], False) - # Update corp infos - for all_corp_info in EveManager.get_all_corporation_info(): - alliance = None - corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) - if corpinfo['alliance']['id'] is not None: - alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) + # Update corp infos + for all_corp_info in EveManager.get_all_corporation_info(): + alliance = None + corpinfo = EveApiManager.get_corporation_information(all_corp_info.corporation_id) + if corpinfo['alliance']['id'] is not None: + alliance = EveManager.get_alliance_info_by_id(corpinfo['alliance']['id']) - if alliance is not None and all_corp_info.alliance is not None: + if alliance is not None and all_corp_info.alliance is not None: - if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) - elif int(alliance.alliance_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(alliance.alliance_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - True) + if (not settings.IS_CORP) and (all_corp_info.alliance.alliance_id == settings.ALLIANCE_ID): + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) + elif int(alliance.alliance_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(alliance.alliance_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, + False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, False) else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], alliance, - False) - else: - if int(all_corp_info.corporation_id) in corp_standings[standing_level]: - if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ - 'standing']) >= settings.BLUE_STANDING: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + if int(all_corp_info.corporation_id) in corp_standings[standing_level]: + if int(corp_standings[standing_level][int(all_corp_info.corporation_id)][ + 'standing']) >= settings.BLUE_STANDING: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, True) + else: + EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) else: EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) - else: - EveManager.update_corporation_info(corpinfo['id'], corpinfo['members']['current'], None, False) # Remove irrelevent corp and alliance models # Check the corps From 3318486e9cee96d0e6698b389c93f29164a75e45 Mon Sep 17 00:00:00 2001 From: Brett Costabile Date: Thu, 19 Nov 2015 00:42:47 -0500 Subject: [PATCH 11/12] Added missing step in manual setup Gotta run corp_update --- vagrant/bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index a7ded303..166973be 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -62,5 +62,6 @@ echo 'Next steps:\n' echo '1. Adjust mysql root password if you feel so inclined.' echo '2. Adjust all the stuff in ./alliance_auth/settings.py.' echo '3. Run sudo python manage.py syncdb to set up the database tables' -echo "4. run cd /vagrant/; ./startup.sh to start, and ./shutdown.sh to stop." +echo '4. Run python manage.py shell < run_alliance_corp_update.py' +echo "5. run cd /vagrant/; ./startup.sh to start, and ./shutdown.sh to stop." echo '--------' From b2dcc1251ebc9e2f5d319041302d8c4172bad56f Mon Sep 17 00:00:00 2001 From: Brett Costabile Date: Thu, 19 Nov 2015 00:58:51 -0500 Subject: [PATCH 12/12] Removed mumble user setup Because we don't need it anymore --- vagrant/bootstrap.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/vagrant/bootstrap.sh b/vagrant/bootstrap.sh index 166973be..9bc4baaf 100755 --- a/vagrant/bootstrap.sh +++ b/vagrant/bootstrap.sh @@ -43,8 +43,6 @@ sudo mysqladmin -p$MYSQL_ROOT_PASS create alliance_killboard sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'allianceserver'@'localhost' IDENTIFIED BY 'password'" sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'allianceserver'@'localhost'"; -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "CREATE USER 'alliancemumble'@'localhost' IDENTIFIED BY 'alliancemumble'" -sudo mysql -u root -p$MYSQL_ROOT_PASS -e "GRANT ALL PRIVILEGES ON * . * TO 'alliancemumble'@'localhost'"; sudo mysqladmin -p$MYSQL_ROOT_PASS flush-privileges