Skip to content
This repository was archived by the owner on Oct 7, 2018. It is now read-only.

Commit ab80ea5

Browse files
committed
Update | 2.3.3-dev
1 parent 1adf145 commit ab80ea5

File tree

4 files changed

+34
-6
lines changed

4 files changed

+34
-6
lines changed

botnet.py

+14-2
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@
88
import random
99
import config
1010
logger = logging.getLogger(__name__)
11-
11+
hdlr = logging.FileHandler('logs/botnet.log')
12+
formatter = logging.Formatter('%(asctime)s [%(threadName)10s][%(module)10s][%(levelname)8s] %(message)s')
13+
hdlr.setFormatter(formatter)
14+
logger.addHandler(hdlr)
15+
logger.setLevel(logging.INFO)
1216

1317
class Botnet:
1418
ut = Utils()
@@ -22,6 +26,7 @@ def __init__(self, player):
2226
self.p = player
2327
self.ofwhat = config.BotNet_updates
2428
self.energy = 0
29+
self.debug = config.debug
2530
self._initbot()
2631

2732
def _initbot(self):
@@ -99,7 +104,11 @@ def upgradebotnet(self, hostname, running, count):
99104
Cycle through and upgrade until no money.
100105
:return: None
101106
"""
102-
ofwhat = self.ofwhat[random.randint(0,len(self.ofwhat)-1)]
107+
ofwhat = self.ofwhat[random.randint(0,(len(self.ofwhat)-1))]
108+
109+
if self.debug:
110+
logger.warning("L106; ofwhat = '%s'",ofwhat)
111+
103112
logger.info("Prepare attempting to upgrade bot net PC '"+ hostname +"'")
104113
get_infobot = self.getInfo()
105114

@@ -141,6 +150,9 @@ def upgradebotnet(self, hostname, running, count):
141150
break
142151

143152
ofwhat = self.ofwhat[random.randint(0,(len(self.ofwhat)-1))]
153+
154+
if self.debug:
155+
logger.warning("L151; ofwhat = '%s'",ofwhat)
144156

145157
new_bal = self.upgradesinglebot(hostname, ofwhat)
146158
if new_bal:

config.py

+4
Original file line numberDiff line numberDiff line change
@@ -61,3 +61,7 @@
6161

6262
# check attack anonymous
6363
anon = True
64+
65+
# enable debugging output
66+
# -- This should only be enabled while development
67+
debug = True

console.py

+5
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
import io
1717
import logging
1818
logger = logging.getLogger(__name__)
19+
hdlr = logging.FileHandler('logs/console.log')
20+
formatter = logging.Formatter('%(asctime)s [%(threadName)10s][%(module)10s][%(levelname)8s] %(message)s')
21+
hdlr.setFormatter(formatter)
22+
logger.addHandler(hdlr)
23+
logger.setLevel(logging.INFO)
1924

2025
original_sigint = None
2126
DATABASE_ENDPOINT = "https://vhack.olympiccode.ga/database/submit.php"

main.py

+11-4
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
import ddos
1313
import logging
1414
logger = logging.getLogger(__name__)
15-
FORMAT = '%(asctime)s [%(threadName)10s][%(module)10s][%(levelname)8s] %(message)s'
16-
logging.basicConfig(level=logging.INFO, format=FORMAT)
17-
15+
hdlr = logging.FileHandler('logs/main.log')
16+
formatter = logging.Formatter('%(asctime)s [%(threadName)10s][%(module)10s][%(levelname)8s] %(message)s')
17+
hdlr.setFormatter(formatter)
18+
logger.addHandler(hdlr)
19+
logger.setLevel(logging.INFO)
1820

1921
class run:
2022
def __init__(self):
@@ -38,6 +40,7 @@ def __init__(self):
3840
self.min_energy_botnet = config.minimal_energy_botnet_upgrade
3941
self.stat = "0"
4042
self.wait_load = config.wait_load
43+
self.debug = config.debug
4144
self.c = Console(self.player)
4245
self.u = Update(self.player)
4346
# disable botnet for > api v13
@@ -49,6 +52,10 @@ def __init__(self):
4952
def init(self):
5053
if(self.updates == "ALL"):
5154
self.updates = ["inet","hdd","cpu","ram","fw","av","sdk","ipsp","spam","scan","adw"]
55+
56+
if self.debug:
57+
logger.warning("Debugging is enabled!");
58+
5259
while True:
5360
# update the player
5461
time.sleep(self.wait_load)
@@ -157,5 +164,5 @@ def init(self):
157164
run.__init__(self)
158165

159166
if __name__ == "__main__":
160-
logger.info("Welcome to ZeusBot v2.3.2-dev for 'vHackXT 1.64' (API Version 15) by OlympicCode and ATVG-Studios!")
167+
logger.info("Welcome to ZeusBot v2.3.3-dev for 'vHackXT 1.64' (API Version 15) by OlympicCode and ATVG-Studios!")
161168
r = run()

0 commit comments

Comments
 (0)