- removed defunct config option

* changed bootstrap node
* improved web interface styles
* start-daemon script hopefully less prone to crash
* fixed openwebinterface url output
* added defaults for timer configs incase config can't be read or the values are missing
master
Kevin Froman 2019-06-16 15:56:22 -05:00
parent 71805811cf
commit 3825d3857c
9 changed files with 19 additions and 12 deletions

View File

@ -101,8 +101,8 @@ class OnionrCommunicatorDaemon:
OnionrCommunicatorTimers(self, self.runCheck, 2, maxThreads=1)
# Timers to periodically lookup new blocks and download them
OnionrCommunicatorTimers(self, self.lookupBlocks, self._core.config.get('timers.lookupBlocks'), requiresPeer=True, maxThreads=1)
OnionrCommunicatorTimers(self, self.getBlocks, self._core.config.get('timers.getBlocks'), requiresPeer=True, maxThreads=2)
OnionrCommunicatorTimers(self, self.lookupBlocks, self._core.config.get('timers.lookupBlocks', 25), requiresPeer=True, maxThreads=1)
OnionrCommunicatorTimers(self, self.getBlocks, self._core.config.get('timers.getBlocks', 30), requiresPeer=True, maxThreads=2)
# Timer to reset the longest offline peer so contact can be attempted again
OnionrCommunicatorTimers(self, self.clearOfflinePeer, 58)

View File

@ -121,8 +121,6 @@ class Onionr:
if type(config.get('client.public.port')) is type(None):
randomPort = netcontroller.getOpenPort()
config.set('client.public.port', randomPort, savefile=True)
if type(config.get('client.participate')) is type(None):
config.set('client.participate', True, savefile=True)
if type(config.get('client.api_version')) is type(None):
config.set('client.api_version', API_VERSION, savefile=True)

View File

@ -26,5 +26,5 @@ def open_home(o_inst):
logger.error('Onionr seems to not be running (could not get api host)')
else:
url = 'http://%s/#%s' % (url, o_inst.onionrCore.config.get('client.webpassword'))
logger.info('If Onionr does not open automatically, use this URL:', url)
logger.info('If Onionr does not open automatically, use this URL: ' + url)
webbrowser.open_new_tab(url)

View File

@ -1 +1 @@
7abghj4dhb4p7ytet4wm4hsejuf2c5ufaznypoifkcacvlzs6yhc6gyd.onion
6i2apk7llawfcqy4y4xumqiedo7nltczmdk2cbvdztaqpkjnygwwz6qd.onion

View File

@ -54,7 +54,10 @@ fetch('/friends/list', {
var keys = [];
for(var k in resp) keys.push(k);
console.log(keys)
friendListDisplay.innerHTML = 'Click name to view info<br><br>'
if (keys.length == 0){
friendListDisplay.innerText = "None yet :("
}
for (var i = 0; i < keys.length; i++){
var peer = keys[i]
var name = resp[keys[i]]['name']

View File

@ -21,7 +21,7 @@
</div>
<div class='content'>
<img class='logo' src='/shared/onionr-icon.png' alt='onionr logo'>
<span class='logoText'>Onionr Web Control Panel</span>
<span class='logoText'>Onionr Friends</span>
<br><br>
<a href='/' class='idLink'>Home</a>
<h2>Friend Manager</h2>
@ -31,7 +31,9 @@
<input type='submit' value='Add Friend' class='successBtn'>
</form>
<h2>Friend List:</h2>
<div id='friendList'>None Yet :(</div>
Click name to view info<br><br>
<div id='friendList'>
</div>
</div>
<script src='/shared/misc.js'></script>
<script src='/friends/friends.js'></script>

View File

@ -17,7 +17,7 @@
</div>
<div class='content'>
<img class='logo' src='/shared/onionr-icon.png' alt='onionr logo'>
<span class='logoText'>Onionr Web Control Panel</span>
<span class='logoText'>Onionr</span>
<br><br>
<div>🕵️‍♂️ Current Used Identity: <input class='myPub' type='text' readonly></div>
<br>

View File

@ -41,11 +41,15 @@ body{
vertical-align: middle;
}
.logoText{
font-family: sans-serif;
font-size: 2em;
margin-top: 1em;
margin-left: 1%;
}
.logoText, h1, h2{
font-family: Verdana, Geneva, Tahoma, sans-serif;
}
.main{
min-height: 500px;
}

View File

@ -2,4 +2,4 @@
cd "$(dirname "$0")"
echo "starting Onionr daemon..."
echo "run onionr.sh stop to stop the daemon, or onionr.sh start to get output"
nohup ./onionr.sh start & disown > /dev/null
exec nohup ./onionr.sh start > /dev/null 2>&1 & disown