dxs
/
onionr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* fixed locale issue in docker 

* fixed uploaded blocks not saving type properly
master
Kevin Froman 2018-08-17 16:50:16 -05:00
parent 40ea61707f
commit cfbc834eb5
No known key found for this signature in database
GPG Key ID: 0D414D0FE405B63B
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -4,13 +4,18 @@ FROM ubuntu:xenial
ENV HOME /root ENV HOME /root
#Install needed packages #Install needed packages
RUN apt update && apt install -y python3 python3-dev python3-pip tor RUN apt update && apt install -y python3 python3-dev python3-pip tor locales
RUN sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen && \
locale-gen
ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8
WORKDIR /srv/ WORKDIR /srv/
ADD ./requirements.txt /srv/requirements.txt ADD ./requirements.txt /srv/requirements.txt
RUN pip3 install -r requirements.txt RUN pip3 install -r requirements.txt
WORKDIR /root/ WORKDIR /root/
#Add Onionr source #Add Onionr source
COPY . /root/ COPY . /root/

4
onionr/blockimporter.py
View File

@ -21,7 +21,7 @@ import core, onionrexceptions, logger
def importBlockFromData(content, coreInst): def importBlockFromData(content, coreInst):
retData = False retData = False
dataHash = coreInst._getSha3Hash(content) dataHash = coreInst._crypto.sha3Hash(content)
if coreInst._blacklist.inBlacklist(dataHash): if coreInst._blacklist.inBlacklist(dataHash):
raise onionrexceptions.BlacklistedBlock('%s is a blacklisted block' % (dataHash,)) raise onionrexceptions.BlacklistedBlock('%s is a blacklisted block' % (dataHash,))
@ -40,7 +40,7 @@ def importBlockFromData(content, coreInst):
if coreInst._crypto.verifyPow(content): # check if POW is enough/correct if coreInst._crypto.verifyPow(content): # check if POW is enough/correct
logger.info('Block passed proof, saving.') logger.info('Block passed proof, saving.')
blockHash = coreInst.setData(content) blockHash = coreInst.setData(content)
blockHash = coreInst.addToBlockDB(blockHash, dataSaved=True) coreInst.addToBlockDB(blockHash, dataSaved=True)
coreInst._utils.processBlockMetadata(blockHash) # caches block metadata values to block database coreInst._utils.processBlockMetadata(blockHash) # caches block metadata values to block database
retData = True retData = True
return retData return retData

2
onionr/static-data/default-plugins/pms/main.py
View File

@ -22,6 +22,8 @@
import logger, config, threading, time, readline, datetime import logger, config, threading, time, readline, datetime
from onionrblockapi import Block from onionrblockapi import Block
import onionrexceptions import onionrexceptions
import locale
locale.setlocale(locale.LC_ALL, '')
plugin_name = 'pms' plugin_name = 'pms'
PLUGIN_VERSION = '0.0.1' PLUGIN_VERSION = '0.0.1'