From a6acfce20e229af9797875748b35c37b5bf70e91 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Tue, 11 Aug 2009 09:33:57 +0000
Subject: [PATCH] bug 1362: updated production binary locations, and disabled
 cnproc validation

---
 RTCP/Run/src/LOFAR/Locations.py | 6 +++---
 RTCP/Run/src/LOFAR/Sections.py  | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/RTCP/Run/src/LOFAR/Locations.py b/RTCP/Run/src/LOFAR/Locations.py
index d02d935ad3e..8ca22bb9610 100644
--- a/RTCP/Run/src/LOFAR/Locations.py
+++ b/RTCP/Run/src/LOFAR/Locations.py
@@ -39,9 +39,9 @@ class Locations:
 	"basedir": "/cephome/lofar-prod/lofar",
 
         # the locations of the main executables
-	"cnproc":  "${BASEDIR}/bin/CN_Processing.cnk",
-	"ionproc": "${BASEDIR}/bin/IONProc.ppc",
-	"storage": "${BASEDIR}/bin/Storage.x86_64",
+	"cnproc":  "${BASEDIR}/bin/CN_Processing",
+	"ionproc": "${BASEDIR}/bin/IONProc",
+	"storage": "${BASEDIR}/bin/Storage",
       } )
       
       self.nodes.update( {
diff --git a/RTCP/Run/src/LOFAR/Sections.py b/RTCP/Run/src/LOFAR/Sections.py
index cb3364e2ea2..8766df4c9cc 100644
--- a/RTCP/Run/src/LOFAR/Sections.py
+++ b/RTCP/Run/src/LOFAR/Sections.py
@@ -16,7 +16,7 @@ class Section:
 
     self.logoutputs = []
     if Locations.nodes["logserver"]:
-      self.logoutputs.append( "tcp:%s" % (Locations.nodes["logserver"],) )
+      self.logoutputs.append( "%s" % (Locations.nodes["logserver"],) )
 
   def __str__(self):
     return self.__class__.__name__
@@ -112,6 +112,7 @@ class CNProcSection(Section):
     self.commands.append( AsyncCommand( "mpirun %s" % (" ".join(mpiparams),), logfiles, killcmd=mpikill ) )
 
   def check(self):
+    return
     # we have to own the partition
     owner = BGcontrol.owner( self.parset.partition )
     me = os.environ["USER"]
-- 
GitLab