Skip to content
This repository was archived by the owner on Apr 22, 2023. It is now read-only.

Commit 86624fe

Browse files
msteenmsteen
committedMay 13, 2019
initial commit
0 parents  commit 86624fe

17 files changed

+482
-0
lines changed
 

‎LICENSE

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Copyright 2019 Matthijs Steen
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
4+
5+
The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
6+
7+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎README.md

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# Live Share support in Visual Studio Code for NixOS
2+
3+
Experimental support for Live Share in Visual Studio Code for NixOS. The need to modify the extension directory in a destructive way and most updates causing the patch files to no longer apply, makes it unsuitable for inclusion in the main Nixpkgs repository, so it is kept in its own repository until a better solution is found.

‎default.nix

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{ ... }:
2+
3+
{
4+
imports = [
5+
./modules/vsliveshare.nix
6+
];
7+
8+
nixpkgs.overlays = [
9+
(import ./pkgs/overlay.nix)
10+
];
11+
}

‎modules/vsliveshare.nix

+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
{ config, lib, pkgs, ... }:
2+
3+
with lib;
4+
5+
let
6+
cfg = config.services.vsliveshare;
7+
pkg = pkgs.vsliveshare.override { enableDiagnosticsWorkaround = cfg.enableDiagnosticsWorkaround; };
8+
9+
writableWorkaroundScript = pkgs.writeScript "vsliveshare-writable-workaround.sh" ''
10+
#!${pkgs.bash}/bin/bash
11+
12+
out=${pkg}
13+
src=$out/share/vscode/extensions/ms-vsliveshare.vsliveshare
14+
15+
# We do not want to pass any invalid path to `rm`.
16+
if [[ ! -d '${cfg.extensionsDir}' ]]; then
17+
echo "The VS Code extensions directory '${cfg.extensionsDir}' does not exist" >&2
18+
exit 1
19+
fi
20+
21+
dst='${cfg.extensionsDir}'/ms-vsliveshare.vsliveshare-$(basename $out | sed 's/.*vsliveshare-//')
22+
23+
# Only run the script when the build has actually changed.
24+
if [[ $(dirname "$(dirname "$(readlink "$dst/dotnet_modules/vsls-agent-wrapped")")") == $src ]]; then
25+
exit 0
26+
fi
27+
28+
# Remove all previous versions of VS Code Live Share.
29+
find '${cfg.extensionsDir}' -mindepth 1 -maxdepth 1 -name 'ms-vsliveshare.vsliveshare-*' -exec rm -r {} \;
30+
31+
# Create the extension directory.
32+
mkdir -p "$dst"
33+
34+
cd "$src"
35+
36+
# Copy over executable files and symlink files that should remain unchanged or that are ELF executables.
37+
executables=()
38+
while read -rd ''' file; do
39+
if [[ ! -x $file ]] || file "$file" | grep -wq ELF; then
40+
dst_file="$dst/$file"
41+
mkdir -p "$(dirname "$dst_file")"
42+
ln -s "$src/$file" "$dst_file"
43+
else
44+
executables+=( "$file" )
45+
fi
46+
done < <(find . -mindepth 1 -type f \( -executable -o -name \*.a -o -name \*.dll -o -name \*.pdb \) -printf '%P\0')
47+
cp --parents --no-clobber --no-preserve=mode,ownership,timestamps -t "$dst" "''${executables[@]}"
48+
chmod -R +x "$dst"
49+
50+
# Copy over the remaining directories and files.
51+
find . -mindepth 1 -type d -printf '%P\0' |
52+
xargs -0r mkdir -p
53+
find . -mindepth 1 ! -type d ! \( -type f \( -executable -o -name \*.a -o -name \*.dll -o -name \*.pdb \) \) -printf '%P\0' |
54+
xargs -0r cp --parents --no-clobber --no-preserve=mode,ownership,timestamps -t "$dst"
55+
56+
# Change the ownership of the files to that of the extension directory rather than root.
57+
chown -R --reference='${cfg.extensionsDir}' "$dst"
58+
'';
59+
60+
in {
61+
options.services.vsliveshare = with types; {
62+
enable = mkEnableOption "VS Code Live Share extension";
63+
enableWritableWorkaround = mkEnableOption "copying the build to the VS Code extension directory to ensure write access";
64+
enableDiagnosticsWorkaround = mkEnableOption "an UNIX socket that filters out the diagnostic logging done by VSLS Agent";
65+
66+
extensionsDir = mkOption {
67+
type = str;
68+
example = "/home/user/.vscode/extensions";
69+
description = ''
70+
The VS Code extensions directory.
71+
CAUTION: The workaround will remove ms-vsliveshare.vsliveshare* inside this directory!
72+
'';
73+
};
74+
};
75+
76+
config = mkIf cfg.enable {
77+
environment.systemPackages = with pkgs; [ bash desktop-file-utils xlibs.xprop ]
78+
++ optional (!cfg.enableWritableWorkaround) pkg;
79+
80+
services.gnome3.gnome-keyring.enable = true;
81+
82+
systemd.services.vsliveshare-writable-workaround = mkIf cfg.enableWritableWorkaround {
83+
description = "VS Code Live Share extension writable workaround";
84+
path = with pkgs; [ file ];
85+
serviceConfig = {
86+
Type = "oneshot";
87+
RemainAfterExit = "yes";
88+
ExecStart = writableWorkaroundScript;
89+
};
90+
wantedBy = [ "multi-user.target" ];
91+
};
92+
};
93+
}

‎pkgs/overlay.nix

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
self: super: {
2+
vsliveshare = super.callPackage ./vsliveshare { };
3+
}

‎pkgs/vsliveshare/agent.js.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- a/out/src/agent.js
2+
+++ b/out/src/agent.js
3+
@@ -140,6 +140,9 @@
4+
startEvent.addProperty(telemetryStrings_1.TelemetryPropertyNames.AGENT_START_RESOLVED_STATE, resolved.toString());
5+
}
6+
if (!resolved && traceSource_1.TraceFormat.parseEventId(line) === traceSource_1.TraceEventIds.RpcListeningOnPipe) {
7+
+ // FIXME: Remove when an actual solution is provided for disabling the diagnostic logging in VSLS Agent.
8+
+ // Workaround to prevent VSLS Agent from spamming the journal.
9+
+ child_process.execFile(path.join(Agent.agentBinariesPath, 'gdb-disable-log.sh'), [Agent.cp.pid]);
10+
resolved = true;
11+
Agent.completeAgentStart(true);
12+
// The agent doesn't really start listening until immediately after

‎pkgs/vsliveshare/connect-dev-log2null.c

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#include <sys/socket.h>
2+
#include <string.h>
3+
4+
// Needed to define `RTLD_NEXT`.
5+
#define __USE_GNU
6+
#include <dlfcn.h>
7+
8+
typedef int (*orig_connect_t)(int, const struct sockaddr*, socklen_t)
9+
10+
int connect(int fd, const struct sockaddr *orig_addr, socklen_t len) {
11+
orig_connect_t orig_connect;
12+
if (!orig_connect) {
13+
orig_connect = (orig_connect_t)dlsym(RTLD_NEXT, "connect");
14+
}
15+
struct sockaddr addr = *orig_addr;
16+
if (addr.sa_family == AF_UNIX && strcmp(addr.sa_data, "/dev/log") == 0) {
17+
strcpy(addr.sa_data, "/dev/null");
18+
}
19+
return orig_connect(fd, orig_addr, len);
20+
}

‎pkgs/vsliveshare/default.nix

+113
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
# Baseed on previous attempts of others: https://github.com/NixOS/nixpkgs/issues/41189
2+
{ lib, vscode-utils, autoPatchelfHook, bash, dos2unix, file, makeWrapper, dotnet-sdk
3+
, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, utillinux, zlib
4+
, enableDiagnosticsWorkaround ? false, gccStdenv
5+
}:
6+
7+
with lib;
8+
9+
let
10+
# https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually
11+
libs = [
12+
# .NET Core
13+
openssl
14+
libkrb5
15+
zlib
16+
icu
17+
18+
# Credential Storage
19+
libsecret
20+
21+
# NodeJS
22+
libX11
23+
24+
# https://github.com/flathub/com.visualstudio.code.oss/issues/11#issuecomment-392709170
25+
libunwind
26+
lttng-ust
27+
curl
28+
29+
# General
30+
gcc.cc.lib
31+
utillinux # libuuid
32+
];
33+
34+
vscode-utils' = if enableDiagnosticsWorkaround
35+
then vscode-utils.override { stdenv = gccStdenv; }
36+
else vscode-utils;
37+
38+
in (vscode-utils'.buildVscodeMarketplaceExtension {
39+
mktplcRef = {
40+
name = "vsliveshare";
41+
publisher = "ms-vsliveshare";
42+
version = "1.0.67";
43+
sha256 = "1shy9xaqz1wsyzzz5z8g409ma5h5kaic0y7bc1q2nxy60gbq828n";
44+
};
45+
}).overrideAttrs(attrs: {
46+
prePatch = ''
47+
dos2unix out/prod/extension-prod.js
48+
'';
49+
50+
patches = [ ./extension-prod.js.patch ];
51+
52+
buildInputs = attrs.buildInputs ++ libs ++ [ autoPatchelfHook bash dos2unix file makeWrapper ];
53+
54+
installPhase = attrs.installPhase + ''
55+
runHook postInstall
56+
'';
57+
58+
postInstall = ''
59+
bash -s <<ENDSUBSHELL
60+
shopt -s extglob
61+
cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare
62+
63+
# A workaround to prevent the journal filling up due to diagnostic logging.
64+
${optionalString enableDiagnosticsWorkaround ''
65+
gcc -fPIC -shared -ldl -o dotnet_modules/noop-syslog.so ${./noop-syslog.c}
66+
''}
67+
68+
# Normally the copying of the right executables and libraries is done externally at a later time,
69+
# but we want it done at installation time.
70+
# FIXME: Surely there is a better way than copying over the shared .NET libraries.
71+
cp \
72+
${dotnet-sdk}/shared/Microsoft.NETCore.App/*/* \
73+
dotnet_modules/runtimes/linux-x64/!(native) \
74+
dotnet_modules/runtimes/linux-x64/native/* \
75+
dotnet_modules/runtimes/unix/lib/netstandard1.3/* \
76+
dotnet_modules
77+
78+
# Those we need are already copied over, the rest is just a waste of space.
79+
rm -r dotnet_modules/runtimes
80+
81+
# Not all executables and libraries are executable, so make sure that they are.
82+
find . -type f ! -executable -exec file {} + | grep -w ELF | cut -d ':' -f1 | tr '\n' '\0' | xargs -0r -n1 chmod +x
83+
84+
# Not all scripts are executed by passing them to a shell, so they need to be executable as well.
85+
find . -type f -name '*.sh' ! -executable -exec chmod +x {} +
86+
87+
# Lock the extension downloader.
88+
touch install-linux.Lock externalDeps-linux.Lock
89+
ENDSUBSHELL
90+
'';
91+
92+
rpath = makeLibraryPath libs;
93+
94+
postFixup = ''
95+
root=$out/share/vscode/extensions/ms-vsliveshare.vsliveshare
96+
97+
# We cannot use `wrapProgram`, because it will generate a relative path,
98+
# which breaks our workaround that makes the extension directory writable.
99+
mv $root/dotnet_modules/vsls-agent{,-wrapped}
100+
makeWrapper $root/dotnet_modules/vsls-agent{-wrapped,} \
101+
--prefix LD_LIBRARY_PATH : "$rpath" ${optionalString enableDiagnosticsWorkaround ''\
102+
--set LD_PRELOAD "$root/dotnet_modules/noop-syslog.so"
103+
''}
104+
'';
105+
106+
meta = {
107+
description = "Live Share lets you achieve greater confidence at speed by streamlining collaborative editing, debugging, and more in real-time during development";
108+
homepage = https://aka.ms/vsls-docs;
109+
license = licenses.unfree;
110+
maintainers = with maintainers; [ msteen ];
111+
platforms = [ "x86_64-linux" ];
112+
};
113+
})

‎pkgs/vsliveshare/extension-prod.js.patch

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
--- a/out/prod/extension-prod.js
2+
+++ b/out/prod/extension-prod.js
3+
@@ -96835,15 +96835,7 @@ async function agentStartupAsync(trace, deactivate, statusBarController) {
4+
activationAgentEvent.end(TelemetryResult_1.TelemetryResult.Success, 'Agent activation success.');
5+
}
6+
catch (e) {
7+
- let errorMessage;
8+
- if (await downloader_1.isInstallCorrupt(trace)) {
9+
- errorMessage = 'An update or installation of VS Live Share failed due to a corrupted download. ' +
10+
- 'Please uninstall and reinstall the extension to resolve. ' +
11+
- 'See https://aka.ms/vsls-corrupted-install for more details.';
12+
- }
13+
- else {
14+
- errorMessage = e.message;
15+
- }
16+
+ const errorMessage = e.message;
17+
const telemetryMessage = 'Agent activation failed. ' + errorMessage;
18+
activationAgentEvent.end(TelemetryResult_1.TelemetryResult.Failure, telemetryMessage);
19+
extensionTelemetry_1.ExtensionTelemetry.sendActivateAgentAsyncFault(FaultType_1.FaultType.Error, telemetryMessage, e, activationAgentEvent);
20+
@@ -112591,20 +112583,13 @@ async function activateInternal(context, activationEvent, isJoin) {
21+
}
22+
activationEvent.markTime(telemetryStrings_1.TelemetryPropertyNames.EXTENSION_ACTIVATION_COMPAT_CHECK_COMPLETE);
23+
const liveShareExtension = vscode.extensions.getExtension('ms-vsliveshare.vsliveshare');
24+
- const installationResult = await downloader_1.ExternalDownloader.ensureRuntimeDependenciesAsync(liveShareExtension, activationEvent);
25+
- const isExtensionUpdated = abTestsUtil_1.isExtensionBeingUpdated();
26+
+ const isExtensionUpdated = true;
27+
activationEvent.addProperty(telemetryStrings_1.TelemetryPropertyNames.IS_EXTENSION_BEING_UPDATED, isExtensionUpdated);
28+
const isExtensionPackCandidatePresent = extensionUtil_1.ExtensionUtil.isExtensionPackCandidatePresent();
29+
activationEvent.addProperty(telemetryStrings_1.TelemetryPropertyNames.IS_EXTENSION_PACK_CANDIDATE_PRESENT, isExtensionPackCandidatePresent);
30+
const isFirstExtensionRun = (installationResult === downloader_1.EnsureRuntimeDependenciesResult.Success) && !isExtensionUpdated && isFirstActivation;
31+
activationEvent.addProperty(telemetryStrings_1.TelemetryPropertyNames.IS_FIRST_EXTENSION_RUN, isFirstExtensionRun);
32+
- // failed to install dependencies
33+
- if (installationResult === downloader_1.EnsureRuntimeDependenciesResult.Failure) {
34+
- activationEvent.end(TelemetryResult_1.TelemetryResult.UserFailure, 'Extension activation failed - download runtime dependencies.');
35+
- vscode.window.showErrorMessage(`${config.get(config.Key.name)} was unable to download needed dependencies to finish installation. Ensure you have network connectivity and restart VS Code to retry.`);
36+
- return;
37+
- }
38+
- else if (isFirstExtensionRun) {
39+
+ if (isFirstExtensionRun) {
40+
activationEvent.addProperty(telemetryStrings_1.TelemetryPropertyNames.FIRST_LIVESHARE_ACTIVATION, true);
41+
// Show the welcome notification on the first installation
42+
const isSelected = (process.env.VSLS_TEST_NORANDOM ? false : Math.random() <= 0.5);
43+
@@ -112622,7 +112607,6 @@ async function activateInternal(context, activationEvent, isJoin) {
44+
}
45+
}
46+
abTester_1.abTester.init(isFirstExtensionRun);
47+
- await extensionUtil_1.ExtensionUtil.updateExecutablePermissionsAsync();
48+
await launcher_1.Launcher.setup(false, !(await downloader_1.installFileExistsAsync()));
49+
activationEvent.markTime(telemetryStrings_1.TelemetryPropertyNames.EXTENSION_ACTIVATION_LAUNCHER_SETUP_COMPLETE);
50+
setupRpcFilters(rpcClientFactory_1.rpcClientFactory());

‎pkgs/vsliveshare/gdb-disable-log.sh

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env bash
2+
fd=$(lsof -p "$1" | grep 'type=DGRAM' | sed -n 's/.*[^0-9]\([0-9]*\)u *unix.*/\1/p')
3+
whoami > /dev/pts/4
4+
if [[ -n $fd ]]; then
5+
gdb --batch -p "$1" \
6+
-ex 'call (int)open("/dev/null", 1)' \
7+
-ex 'call (int)dup2($1, '$fd')' \
8+
-ex 'call (int)close($1)' \
9+
> /dev/pts/4 2>&1
10+
fi

‎pkgs/vsliveshare/link.sh

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#!/usr/bin/env bash
2+
out=/nix/store/1lhpmk7amqy7zfldqg26lcp3k8x91y3j-vscode-extension-ms-vsliveshare-vsliveshare-0.3.954
3+
src=$out/share/vscode/extensions/ms-vsliveshare.vsliveshare
4+
5+
dst=~/.vscode/extensions/ms-vsliveshare.vsliveshare-$(basename $out | sed 's/.*vsliveshare-//')
6+
7+
# Only run the script when the build has actually changed.
8+
# if [[ $(dirname "$(dirname "$(readlink "${dst}/dotnet_modules/vsls-agent-wrapped")")") == $src ]]; then
9+
# exit 0
10+
# fi
11+
12+
# Remove all previous versions of VS Code Live Share.
13+
rm -r ~/.vscode/extensions/ms-vsliveshare.vsliveshare*
14+
15+
# Create the extension directory.
16+
mkdir -p "$dst"
17+
18+
# Symlink files which should remain unchanged.
19+
find $src -type f \( -name \*.a -o -name \*.dll -o -name \*.pdb \) | while read -r src_file; do
20+
dst_file="${dst}${src_file#${src}}"
21+
mkdir -p $(dirname "$dst_file")
22+
ln -s "$src_file" "$dst_file"
23+
done
24+
25+
# Symlink ELF executables and copy over executable files.
26+
find $src -type f -executable | while read -r src_file; do
27+
dst_file="${dst}${src_file#${src}}"
28+
mkdir -p $(dirname "$dst_file")
29+
if file "$src_file" | grep -wq ELF; then
30+
ln -s "$src_file" "$dst_file"
31+
else
32+
cp --no-preserve=mode,ownership,timestamps "$src_file" "$dst_file"
33+
chmod +x "$dst_file"
34+
fi
35+
done
36+
37+
# Copy over the remaining files and directories.
38+
# FIXME: Use a different command that does not warn about files being the same.
39+
cp -r --no-clobber --no-preserve=mode,ownership,timestamps "$src/." "$dst" 2> >(grep -Ev "^cp: '.*' and '.*' are the same file$")
40+
exit 0

‎pkgs/vsliveshare/noop-syslog.c

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
void syslog(int priority, const char *format, ...) { }

‎pkgs/vsliveshare/test.sh

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
out=/nix/store/acj5pr3bj0v19f9a4d1x1psly35fvml6-vscode-extension-ms-vsliveshare-vsliveshare-0.3.954
3+
for out in $(nix-store -qR $out); do
4+
if find $out -type f -exec strings {} + | grep -q '/dev/log'; then
5+
echo $out
6+
fi
7+
done

‎pkgs/vsliveshare/vsls-agent-log.py

+72
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# -*- coding: utf-8 -*-
2+
# Based on: http://www.velvetcache.org/2010/06/14/python-unix-sockets
3+
4+
from __future__ import print_function
5+
import atexit
6+
import os
7+
import re
8+
import socket
9+
import subprocess
10+
import sys
11+
12+
DEV_LOG = '/dev/log'
13+
SYSTEMD_JOURNAL_LOG = '/run/systemd/journal/dev-log'
14+
VSLS_AGENT_LOG = '/run/vsls-agent-log'
15+
16+
def print_err(*args, **kwargs):
17+
print(*args, file=sys.stderr, **kwargs)
18+
19+
if not os.path.exists(SYSTEMD_JOURNAL_LOG):
20+
print_err("systemd journal log UNIX socket '{}' does not exist".format(SYSTEMD_JOURNAL_LOG))
21+
exit(1)
22+
23+
if not os.path.islink(DEV_LOG) or os.readlink(DEV_LOG) != SYSTEMD_JOURNAL_LOG:
24+
print_err("path '{}' is not a symlink to path '{}'".format(DEV_LOG, SYSTEMD_JOURNAL_LOG))
25+
exit(1)
26+
27+
if os.path.exists(VSLS_AGENT_LOG):
28+
print("removing existing path '{}'...".format(VSLS_AGENT_LOG))
29+
os.remove(VSLS_AGENT_LOG)
30+
31+
print("binding VSLS Agent log UNIX socket to path '{}'...".format(VSLS_AGENT_LOG))
32+
vsls_agent_log = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
33+
vsls_agent_log.bind(VSLS_AGENT_LOG)
34+
os.chmod(VSLS_AGENT_LOG, 0o666)
35+
36+
@atexit.register
37+
def close_vsls_agent_log():
38+
print("closing VSLS Agent log UNIX socket...")
39+
vsls_agent_log.close()
40+
print("unbinding VSLS Agent log UNIX socket from path '{}'...".format(VSLS_AGENT_LOG))
41+
os.remove(VSLS_AGENT_LOG)
42+
43+
print("moving the symlink for path '{}' to '{}'...".format(DEV_LOG, VSLS_AGENT_LOG))
44+
os.unlink(DEV_LOG)
45+
os.symlink(VSLS_AGENT_LOG, DEV_LOG)
46+
47+
@atexit.register
48+
def restore_symlink_dev_log():
49+
print("restoring the symlink for path '{}' back to '{}'...".format(DEV_LOG, SYSTEMD_JOURNAL_LOG))
50+
os.unlink(DEV_LOG)
51+
os.symlink(SYSTEMD_JOURNAL_LOG, DEV_LOG)
52+
53+
print("connecting to systemd journal log UNIX socket...")
54+
systemd_journal_log = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
55+
systemd_journal_log.connect(SYSTEMD_JOURNAL_LOG)
56+
57+
@atexit.register
58+
def close_dev_log():
59+
print("closing systemd journal log UNIX socket...")
60+
systemd_journal_log.close()
61+
62+
# <15>Nov 14 18:41:09 vsls-agent-wrapped: Agent.Rpc.Auth Verbose: 0 :
63+
from_vsls_agent_pat = re.compile('<[0-9]+>[a-zA-Z]+ [0-9]{1,2} [0-9]{1,2}:[0-9]{2}:[0-9]{2} vsls-agent-wrapped:.*')
64+
65+
print("listening to VSLS Agent log UNIX socket...")
66+
try:
67+
while True:
68+
line = vsls_agent_log.recv(4096)
69+
if not from_vsls_agent_pat.match(line):
70+
systemd_journal_log.send(line)
71+
except KeyboardInterrupt:
72+
pass

‎pkgs/vsliveshare/write-log

14.3 KB
Binary file not shown.

‎pkgs/vsliveshare/write-log.c

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#include <stdio.h>
2+
#include <stdlib.h>
3+
#include <string.h>
4+
#include <sys/socket.h>
5+
#include <unistd.h>
6+
7+
int main(int argc, char **argv) {
8+
int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
9+
if (fd < 0) {
10+
perror("opening UNIX DGRAM socket");
11+
exit(1);
12+
}
13+
struct sockaddr addr;
14+
memset(&addr, 0, sizeof(addr));
15+
addr.sa_family = AF_UNIX;
16+
strcpy(addr.sa_data, "/dev/log");
17+
if (connect(fd, &addr, sizeof(addr)) < 0) {
18+
close(fd);
19+
perror("connecting to UNIX DGRAM socket");
20+
exit(1);
21+
}
22+
char *data = argc > 1 ? argv[1] : "Hello World!";
23+
if (write(fd, data, strlen(data)) < 0) {
24+
close(fd);
25+
perror("writing to UNIX DGRAM socket");
26+
exit(1);
27+
}
28+
return 0;
29+
}

‎pkgs/vsliveshare/write-log.py

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# -*- coding: utf-8 -*-
2+
import socket
3+
import sys
4+
5+
DEV_LOG = '/dev/log'
6+
VSLS_AGENT_LOG = '/run/vsls-agent-log'
7+
8+
client = socket.socket(socket.AF_UNIX, socket.SOCK_DGRAM)
9+
client.connect(DEV_LOG)
10+
client.send(sys.argv[1] if len(sys.argv) > 1 else "Hello World!")
11+
client.close()

0 commit comments

Comments
 (0)
This repository has been archived.