Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

v1.0.38 #62

Merged
merged 4 commits into from
Feb 20, 2024
Merged

v1.0.38 #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3931c20
improve abort message
neuroscr Feb 6, 2023
3096a0d
shutdown_storage murders storage server 2nd call
neuroscr Feb 20, 2024
a7b20cb
Merge branch 'dev' of https://github.com/hesiod-project/oxen-rancher …
neuroscr Feb 20, 2024
9e841c2
fix typo
neuroscr Feb 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions daemon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,12 @@ function shutdown_blockchain() {
}

function shutdown_storage() {
if (storageServer && storageServer.killed) {
if (lib.isPidRunning(storageServer.pid)) {
console.log('LAUNCHER: killing SS again')
process.kill(storageServer.pid, 'SIGKILL')
}
}
if (storageServer && !storageServer.killed) {
// FIXME: was killed not set?
try {
Expand Down Expand Up @@ -530,6 +536,7 @@ function launcherStorageServer(config, args, cb) {
if (data === undefined) {
console.log('STORAGE: RPC server not responding, restarting storage server')
shutdown_storage()
// what restarts this? something does
}
})
}
Expand Down
4 changes: 3 additions & 1 deletion lib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -607,7 +607,9 @@ async function runStorageRPCTest(lokinet, config, cb) {
var responded = false
var ref = {
abort: function () {
console.log('runStorageRPCTest abort: never called httpGet?')
// usually get this why oxend is syncing...
// sometimes httpGet wasn't called
console.log('runStorageRPCTest abort or timeout, is oxend syncing?')
}
}
var storage_rpc_timer = setTimeout(function() {
Expand Down
Loading