Skip to content

Commit

Permalink
Removes automatic fix for LD_PRELOAD. This was causing issues for ser…
Browse files Browse the repository at this point in the history
…ver deploys (#287)
  • Loading branch information
James-Crean authored Apr 20, 2018
1 parent df24923 commit a9cd7fa
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 15 deletions.
10 changes: 7 additions & 3 deletions frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 0 additions & 12 deletions scripts/vcdat
Original file line number Diff line number Diff line change
Expand Up @@ -49,18 +49,6 @@ if(args.print_log):

print "Logs are going to:", logfile.name

try:
logfile.write("\nTesting VCS\n")
logfile.flush()
subprocess.check_output("python -c 'import vcs; x=vcs.init(); x.open()'", shell=True, stderr=logfile)
except subprocess.CalledProcessError:
logfile.write("\nVCS failed to start. Attempting to fix LD_PRELOAD path...\n")
logfile.flush()
if('LD_PRELOAD' in os.environ.keys()):
logfile.write("LD_PRELOAD was: '{}'\n".format(os.environ['LD_PRELOAD']))
logfile.flush()
os.environ['LD_PRELOAD'] = "/usr/lib/x86_64-linux-gnu/libstdc++.so.6"

print "Starting VCSJS on PORT:", VCSJS_PORT
vcs_server = subprocess.Popen(
["vcs-server", "--port", VCSJS_PORT], stdout=logfile, stderr=logfile)
Expand Down

0 comments on commit a9cd7fa

Please sign in to comment.