Browse Source

correct the setup.py for proper regex replacement and add logfile in daemon mode

nareshv 11 years ago
parent
commit
b52cfc9f91
3 changed files with 8 additions and 2 deletions
  1. 2 0
      hhvm/deploy/config-debug.hdf
  2. 2 0
      hhvm/deploy/config.hdf
  3. 4 2
      hhvm/setup.py

+ 2 - 0
hhvm/deploy/config-debug.hdf

@@ -12,8 +12,10 @@ Server {
 
 
 # Enable debug logging
 # Enable debug logging
 Log {
 Log {
+  UseLogFile = true
   UseSyslog = false
   UseSyslog = false
   Level = Verbose
   Level = Verbose
+  File = /tmp/FrameworkBenchmarks/hhvm/error.log
 }
 }
 
 
 # Enable jit for production mode
 # Enable jit for production mode

+ 2 - 0
hhvm/deploy/config.hdf

@@ -12,8 +12,10 @@ Server {
 
 
 # Disable logging completely
 # Disable logging completely
 Log {
 Log {
+  UseLogFile = false
   UseSyslog = false
   UseSyslog = false
   Level = Error
   Level = Error
+  File = /tmp/FrameworkBenchmarks/hhvm/error.log
 }
 }
 
 
 # Enable jit for production mode
 # Enable jit for production mode

+ 4 - 2
hhvm/setup.py

@@ -7,10 +7,12 @@ from os.path import expanduser
 home = expanduser("~")
 home = expanduser("~")
 
 
 def start(args, logfile, errfile):
 def start(args, logfile, errfile):
-  setup_util.replace_text("hhvm/once.php.inc", "host=.*;", "host=" + args.database_host + ";")
+  setup_util.replace_text("hhvm/once.php.inc", "host=localhost;", "host=" + args.database_host + ";")
   setup_util.replace_text("hhvm/deploy/config.hdf", "SourceRoot = .*\/FrameworkBenchmarks", "SourceRoot = " + home + "/FrameworkBenchmarks")
   setup_util.replace_text("hhvm/deploy/config.hdf", "SourceRoot = .*\/FrameworkBenchmarks", "SourceRoot = " + home + "/FrameworkBenchmarks")
   setup_util.replace_text("hhvm/deploy/config.hdf", "Path = .*\/.hhvm.hhbc", "Path = " + home + "/FrameworkBenchmarks/hhvm/.hhvm.bbhc")
   setup_util.replace_text("hhvm/deploy/config.hdf", "Path = .*\/.hhvm.hhbc", "Path = " + home + "/FrameworkBenchmarks/hhvm/.hhvm.bbhc")
-  setup_util.replace_text("hhvm/deploy/config.hdf", "PidFile = .*\/hhvm.pid", "Path = " + home + "/FrameworkBenchmarks/hhvm/hhvm.pid")
+  setup_util.replace_text("hhvm/deploy/config.hdf", "PidFile = .*\/hhvm.pid", "PidFile = " + home + "/FrameworkBenchmarks/hhvm/hhvm.pid")
+  setup_util.replace_text("hhvm/deploy/config.hdf", "File = .*\/error.log", "File = " + home + "/FrameworkBenchmarks/hhvm/error.log")
+
 
 
   try:
   try:
     if os.name == 'nt':
     if os.name == 'nt':