From 64278b6573306a0580122a06b17aa8384b158dbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20L=C3=BChne?= Date: Tue, 26 May 2020 03:51:05 +0200 Subject: [PATCH] Create socket and pipes in /run --- github-fast-env/github-fast-env.rb | 2 +- github-fast-env/github-fast-envd.rb | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/github-fast-env/github-fast-env.rb b/github-fast-env/github-fast-env.rb index 9c679e6..72f83ff 100644 --- a/github-fast-env/github-fast-env.rb +++ b/github-fast-env/github-fast-env.rb @@ -33,7 +33,7 @@ end # TODO: support arguments script_path = File.realpath(ARGV[0]) -control_socket_path = "/tmp/github-fast-envd.sock" +control_socket_path = "/run/github-fast-env/github-fast-envd.sock" $original_stdin = $stdin.dup $original_stdout = $stdout.dup diff --git a/github-fast-env/github-fast-envd.rb b/github-fast-env/github-fast-envd.rb index b2ec98c..a0d1718 100644 --- a/github-fast-env/github-fast-envd.rb +++ b/github-fast-env/github-fast-envd.rb @@ -29,7 +29,13 @@ $original_stdin = $stdin.dup $original_stdout = $stdout.dup $original_stderr = $stderr.dup -control_socket_path = "/tmp/github-fast-envd.sock" +$run_base_path = "/run/github-fast-env" + +unless File.directory?($run_base_path) + FileUtils.mkdir_p($run_base_path, :mode => 0700) +end + +control_socket_path = "#{$run_base_path}/github-fast-envd.sock" if File.exist?(control_socket_path) and File.socket?(control_socket_path) File.unlink(control_socket_path) @@ -87,7 +93,7 @@ def read_command(control_socket) end def set_up_named_pipes(control_socket, connection_id) - pipe_base_path = "/tmp/github-fast-envd.#{connection_id}" + pipe_base_path = "/#{$run_base_path}/github-fast-envd.#{connection_id}" pipe_base_path_encoded = Base64.encode64(pipe_base_path).delete("\n") stdin = open_pipe("#{pipe_base_path}.stdin")