Compare commits
4
Commits
2.15.4
...
2.15.7_rc1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
96724ae9ac | ||
|
|
46b3ab5da8 | ||
|
|
19e66a1c32 | ||
|
|
cb0dfa50b3 |
No files matched your search
@@ -115,22 +115,34 @@ namespace mbts.ui.shell
|
||||
{
|
||||
try
|
||||
{
|
||||
var path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
|
||||
if (File.Exists(path + "config\\stunnel.conf"))
|
||||
{
|
||||
uint job_error = BTSUINativeMethods.setup_process_job_object();
|
||||
//if we can't put this process and stunnel into a job, try to stop stunnel then restart
|
||||
if(job_error != 0)
|
||||
kill_stunnel();
|
||||
start_stunnel(path, job_error);
|
||||
}
|
||||
string path = Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData) + "\\BTS\\stunnel\\";
|
||||
Log.Ui.warn($"Looking for stunnel in {path}");
|
||||
start_stunnel_from_path(path);
|
||||
path = new DirectoryInfo(AppDomain.CurrentDomain.BaseDirectory).FullName + "\\stunnel\\";
|
||||
Log.Ui.warn($"Looking for stunnel in {path}");
|
||||
start_stunnel_from_path(path);
|
||||
path = "C:\\Program Files (x86)\\BTS\\stunnel\\";
|
||||
Log.Ui.warn($"Last Time Looking for stunnel in {path}");
|
||||
start_stunnel_from_path(path);
|
||||
}
|
||||
catch(Exception ex)
|
||||
catch (Exception ex)
|
||||
{
|
||||
stunnel_job_error = "Error starting stunnel: " + ex.Message;
|
||||
}
|
||||
}
|
||||
|
||||
private void start_stunnel_from_path(string path)
|
||||
{
|
||||
if (File.Exists(path + "config\\stunnel.conf"))
|
||||
{
|
||||
uint job_error = BTSUINativeMethods.setup_process_job_object();
|
||||
//if we can't put this process and stunnel into a job, try to stop stunnel then restart
|
||||
if (job_error != 0)
|
||||
kill_stunnel();
|
||||
start_stunnel(path, job_error);
|
||||
}
|
||||
}
|
||||
|
||||
public new int Run() {
|
||||
var argv = Environment.GetCommandLineArgs();
|
||||
try {
|
||||
|
||||
+5
-6
@@ -5,7 +5,6 @@ from bluetradingsystems/linux_docker
|
||||
# This lets us query an image to see when it was built
|
||||
ARG SDK_VERSION=0
|
||||
ARG SDK_BUILD_DATE=0
|
||||
ARG USERNAME=bts
|
||||
|
||||
# configure build_examples
|
||||
env SDK_ROOT=/sdk \
|
||||
@@ -13,14 +12,14 @@ env SDK_ROOT=/sdk \
|
||||
SDK_BUILD_DATE=$SDK_BUILD_DATE
|
||||
|
||||
# add user bts
|
||||
RUN groupadd --gid 1000 $USERNAME && \
|
||||
useradd -s /bin/bash --uid 1000 --gid 1000 -m $USERNAME && \
|
||||
RUN groupadd --gid 1000 bts && \
|
||||
useradd -s /bin/bash --uid 1000 --gid 1000 -m bts && \
|
||||
mkdir -p /sparkbin/plugins && \
|
||||
mkdir /sparkdata && \
|
||||
mkdir /sdk && \
|
||||
ln -s /sparkbin/ /sdk/lib && \
|
||||
echo $USERNAME ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/$USERNAME && \
|
||||
chmod 0440 /etc/sudoers.d/$USERNAME && \
|
||||
echo bts ALL=\(root\) NOPASSWD:ALL > /etc/sudoers.d/bts && \
|
||||
chmod 0440 /etc/sudoers.d/bts && \
|
||||
chown -R bts.bts /sparkbin/plugins && \
|
||||
chown -R bts.bts /sparkdata
|
||||
|
||||
@@ -29,6 +28,6 @@ COPY include/ /sdk/include/
|
||||
COPY lib/ /sparkbin/
|
||||
COPY externals /sdk/externals/
|
||||
COPY spark.conf /sparkdata/conf/
|
||||
COPY --chown=$USERNAME futures.coconut /sparkdata/data/replay/futures.coconut
|
||||
COPY --chown=bts futures.coconut /sparkdata/data/replay/futures.coconut
|
||||
|
||||
|
||||
Reference in new issue
Block a user