Changeset 5fb5824 in osmose-backend


Ignore:
Timestamp:
Dec 19, 2014 7:24:45 PM (5 years ago)
Author:
Jocelyn Jaubert <jocelyn.jaubert@…>
Branches:
master
Children:
be74bbc
Parents:
d16b079
git-author:
Jocelyn Jaubert <jocelyn.jaubert@…> (19/12/2014 19:23:51)
git-committer:
Jocelyn Jaubert <jocelyn.jaubert@…> (19/12/2014 19:24:45)
Message:

Remove specification of memory with JAVACMD_OPTIONS

The specific values are dependant on the machine, and cannot really be set for
everybody. Only tmp_dir is kept, as it is configured in osmose configuration.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • osmose_run.py

    reff8a79 r5fb5824  
    493493 
    494494    # variable used by osmosis 
    495     os.environ["JAVACMD_OPTIONS"] = "-Xms2048M -Xmx2048M -XX:MaxPermSize=2048M -Djava.io.tmpdir="+conf.dir_tmp 
    496     if "http_proxy" in os.environ: 
    497         (_tmp, host, port) = os.environ["http_proxy"].split(":") 
    498         host = host.split("/")[2] 
    499         os.environ["JAVACMD_OPTIONS"] += " -Dhttp.proxyHost=%s -Dhttp.proxyPort=%s" % (host, port) 
    500         os.environ["JAVACMD_OPTIONS"] += " -Djava.net.preferIPv6Addresses=false" 
     495    if not "JAVACMD_OPTIONS" in os.environ: 
     496        os.environ["JAVACMD_OPTIONS"] = "" 
     497    os.environ["JAVACMD_OPTIONS"] += " -Djava.io.tmpdir="+conf.dir_tmp 
    501498 
    502499    ########################################################################## 
Note: See TracChangeset for help on using the changeset viewer.