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

Merge branch 'crypto' of https://github.com/beardog108/onionr into crypto

Browse source
This commit is contained in:
Arinerron 2018-03-03 14:19:04 -08:00
commit ce5bb6554d
3 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
docs/onionr-logo.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 9.4 KiB

6
onionr/communicator.py
View file

@ -20,7 +20,7 @@ and code to operate as a daemon, getting commands from the command queue databas
along with this program. If not, see <https://www.gnu.org/licenses/>. along with this program. If not, see <https://www.gnu.org/licenses/>.
''' '''
import sqlite3, requests, hmac, hashlib, time, sys, os, math, logger, urllib.parse import sqlite3, requests, hmac, hashlib, time, sys, os, math, logger, urllib.parse
import core, onionrutils, onionrcrypto, onionrproofs, btc, config import core, onionrutils, onionrcrypto, onionrproofs, btc, config, onionrplugins as plugins
class OnionrCommunicate: class OnionrCommunicate:
def __init__(self, debug, developmentMode): def __init__(self, debug, developmentMode):
@ -76,7 +76,7 @@ class OnionrCommunicate:
blockProcessTimer = 0 blockProcessTimer = 0
if command != False: if command != False:
if command[0] == 'shutdown': if command[0] == 'shutdown':
logger.warn('Daemon recieved exit command.') logger.info('Daemon recieved exit command.')
break break
time.sleep(1) time.sleep(1)
@ -218,7 +218,7 @@ class OnionrCommunicate:
shouldRun = False shouldRun = False
debug = True debug = True
developmentMode = False developmentMode = False
if logger.get('devmode', True): if config.get('devmode', True):
developmentMode = True developmentMode = True
try: try:
if sys.argv[1] == 'run': if sys.argv[1] == 'run':

4
readme.md
View file

@ -1,8 +1,10 @@
![Onionr logo](./docs/onionr-logo.png)
# Onionr # Onionr
[![Build Status](https://travis-ci.org/beardog108/onionr.svg?branch=master)](https://travis-ci.org/beardog108/onionr) [![Build Status](https://travis-ci.org/beardog108/onionr.svg?branch=master)](https://travis-ci.org/beardog108/onionr)
P2P platform, using Tor & I2P. Anonymous P2P platform, using Tor & I2P.
Major work in progress. Major work in progress.