|
|
@@ -327,6 +327,8 @@ def main():
|
|
|
|
|
|
if len(sys.argv)>1:
|
|
|
globalkw=sys.argv[1]
|
|
|
+ port=int(sys.argv[2])
|
|
|
+ proxyport=int(sys.argv[3])
|
|
|
|
|
|
failcnt=0
|
|
|
localip=socket.gethostbyname(socket.gethostname())
|
|
|
@@ -347,9 +349,6 @@ def main():
|
|
|
port=int(sys.argv[1])
|
|
|
proxyport=int(sys.argv[2])
|
|
|
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if not chrome_window:
|
|
|
print('restart docker p{}'.format(port))
|
|
|
# os.system('sudo docker container restart p'+str(port))
|
|
|
@@ -363,7 +362,7 @@ def main():
|
|
|
area_num=None
|
|
|
while True:
|
|
|
try:
|
|
|
- if len(sys.argv) > 3 :
|
|
|
+ if len(sys.argv) > 4 :
|
|
|
repkw=sys.argv[1]
|
|
|
repnum=sys.argv[2]
|
|
|
if 'SCAN' in repkw:
|
|
|
@@ -371,7 +370,7 @@ def main():
|
|
|
else:
|
|
|
job=get_next_job(db,repeat=True,repkw=repkw,repnum=repnum)
|
|
|
else:
|
|
|
- job=get_next_job(db)
|
|
|
+ job=get_next_job(db, globalkw)
|
|
|
print(job)
|
|
|
keyword = job['kw']
|
|
|
latitude = job['lat'] #緯度
|
