Merge branch 'master' of github.com:CIRCL/AIL-framework

pull/297/head v1.4
Alexandre Dulaunoy 2018-10-02 17:24:35 +02:00
commit 5bea6b5bb4
No known key found for this signature in database
GPG Key ID: 09E2CD4944E6CBCD
3 changed files with 4 additions and 5 deletions

View File

@ -42,6 +42,8 @@ else:
zmq_url = "tcp://127.0.0.1:5556"
pystemonpath = cfg.get("Directories", "pystemonpath")
pastes_directory = cfg.get("Directories", "pastes")
pastes_directory = os.path.join(os.environ['AIL_HOME'], pastes_directory)
base_sleeptime = 0.01
sleep_inc = 0
@ -65,7 +67,7 @@ while True:
try:
with open(pystemonpath+paste, 'rb') as f: #.read()
messagedata = f.read()
path_to_send = pystemonpath+paste
path_to_send = pastes_directory+paste
s = b' '.join( [ topic.encode(), path_to_send.encode(), base64.b64encode(messagedata) ] )
socket.send(s)

View File

@ -3,7 +3,6 @@ bloomfilters = Blooms
dicofilters = Dicos
pastes = PASTES
hash = HASHS
base64 = BASE64
crawled = crawled
crawled_screenshot = CRAWLED_SCREENSHOT

View File

@ -92,9 +92,7 @@ pushd var/www/
./update_thirdparty.sh
popd
year1=20`date +%y`
year2=20`date --date='-1 year' +%y`
mkdir -p $AIL_HOME/{PASTES,Blooms,dumps}
mkdir -p $AIL_HOME/PASTES
pip3 install -U pip
pip3 install -U -r pip3_packages_requirement.txt