Commit 01445d08 authored by Priscila Manhaes's avatar Priscila Manhaes

added path of environment for handlers

parent 5625cbbc
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
############################################################################## ##############################################################################
from slapos.recipe.librecipe import BaseSlapRecipe from slapos.recipe.librecipe import BaseSlapRecipe
import os import os
from os.path import sep
import pkg_resources import pkg_resources
import sys import sys
import zc.buildout import zc.buildout
...@@ -95,11 +96,17 @@ class Recipe(BaseSlapRecipe): ...@@ -95,11 +96,17 @@ class Recipe(BaseSlapRecipe):
def installConversionServer(self, ip, port, openoffice_port): def installConversionServer(self, ip, port, openoffice_port):
name = 'conversion_server' name = 'conversion_server'
env_path = []
for binary in self.options.get('link_binary_list', '').splitlines():
path = sep.join(binary.split(sep)[:-1])
if not path in env_path:
env_path.append(path)
working_directory = self.createDataDirectory(name) working_directory = self.createDataDirectory(name)
conversion_server_dict = dict( conversion_server_dict = dict(
working_path=working_directory, working_path=working_directory,
uno_path=self.options['ooo_uno_path'], uno_path=self.options['ooo_uno_path'],
office_binary_path=self.options['ooo_binary_path'], office_binary_path=self.options['ooo_binary_path'],
env_PATH = ':'.join(env_path)[1:],
ip=ip, ip=ip,
port=port, port=port,
openoffice_port=openoffice_port, openoffice_port=openoffice_port,
......
...@@ -32,6 +32,7 @@ limit_memory_used = 3000 ...@@ -32,6 +32,7 @@ limit_memory_used = 3000
application_hostname = %(ip)s application_hostname = %(ip)s
# OpenOffice Port # OpenOffice Port
openoffice_port = %(openoffice_port)s openoffice_port = %(openoffice_port)s
env-PATH = %(env_PATH)s
# LD_LIBRARY_PATH passed to OpenOffice # LD_LIBRARY_PATH passed to OpenOffice
env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s env-LD_LIBRARY_PATH = %(LD_LIBRARY_PATH)s
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment