Skip to content

Commit

Permalink
Merge pull request #223 from soutaro/logging
Browse files Browse the repository at this point in the history
More logs
  • Loading branch information
soutaro committed Sep 30, 2020
2 parents 5c2110b + 183b050 commit 16b7565
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
7 changes: 7 additions & 0 deletions lib/steep/server/master.rb
Original file line number Diff line number Diff line change
Expand Up @@ -35,27 +35,34 @@ def start
register_code_to_worker(paths, worker: code_workers[index])
end

tags = Steep.logger.formatter.current_tags.dup
tags << "master"

Thread.new do
Steep.logger.formatter.push_tags(*tags, "from-worker@interaction")
interaction_worker.reader.read do |message|
process_message_from_worker(message)
end
end

Thread.new do
Steep.logger.formatter.push_tags(*tags, "from-worker@signature")
signature_worker.reader.read do |message|
process_message_from_worker(message)
end
end

code_workers.each do |worker|
Thread.new do
Steep.logger.formatter.push_tags(*tags, "from-worker@#{worker.name}")
worker.reader.read do |message|
process_message_from_worker(message)
end
end
end

Thread.new do
Steep.logger.formatter.push_tags(*tags, "from-client")
reader.read do |request|
process_message_from_client(request)
end
Expand Down
6 changes: 4 additions & 2 deletions lib/steep/server/worker_process.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,15 @@ class WorkerProcess
attr_reader :writer
attr_reader :stderr

attr_reader :name
attr_reader :wait_thread

def initialize(reader:, writer:, stderr:, wait_thread:)
def initialize(reader:, writer:, stderr:, wait_thread:, name:)
@reader = reader
@writer = writer
@stderr = stderr
@wait_thread = wait_thread
@name = name
end

def self.spawn_worker(type, name:, steepfile:)
Expand All @@ -33,7 +35,7 @@ def self.spawn_worker(type, name:, steepfile:)
writer = LanguageServer::Protocol::Transport::Io::Writer.new(stdin)
reader = LanguageServer::Protocol::Transport::Io::Reader.new(stdout)

new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread)
new(reader: reader, writer: writer, stderr: stderr, wait_thread: thread, name: name)
end

def self.spawn_code_workers(steepfile:, count: [Etc.nprocessors-3, 1].max)
Expand Down

0 comments on commit 16b7565

Please sign in to comment.