Skip to content

add timeout guard for nimsuggest startup #411

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

Open
ZoomRmc wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add timeout guard for nimsuggest startup #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion ls.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1074,7 +1074,7 @@ proc createOrRestartNimsuggest*(

debug "Creating new nimsuggest project", projectFile = projectFile

let projectNext = waitFor createNimsuggest(
let projectFut = createNimsuggest(
projectFile,
nimsuggestPath,
version,
Expand All @@ -1085,7 +1085,13 @@ proc createOrRestartNimsuggest*(
configuration.logNimsuggest.get(false),
configuration.exceptionHintsEnabled,
)
let projectOpt = waitFor utils.withTimeout(projectFut, NIMSUGGEST_STARTUP_TIMEOUT)

if projectOpt.isNone:
error "Nimsuggest startup timed out", projectFile = projectFile
return

let projectNext = projectOpt.get
if projectFile in ls.projectFiles:
var project = ls.projectFiles[projectFile]
project.stop()
Expand Down
1 change: 1 addition & 0 deletions suggestapi.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import
stew/[byteutils]

const REQUEST_TIMEOUT* = 120000
const NIMSUGGEST_STARTUP_TIMEOUT* = 30000
const HighestSupportedNimSuggestProtocolVersion = 4

# copied from Nim repo
Expand Down