Переглянути джерело

HPCC-23887 - Standalone hthor programs failing

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Richard Chapman 5 роки тому
батько
коміт
38478c2f9c
3 змінених файлів з 8 додано та 8 видалено
  1. 1 1
      common/workunit/workunit.cpp
  2. 6 6
      ecl/eclagent/eclagent.cpp
  3. 1 1
      ecl/eclcc/eclcc.cpp

+ 1 - 1
common/workunit/workunit.cpp

@@ -3903,7 +3903,7 @@ public:
     virtual bool aborting() const
             { return c->aborting(); }
     virtual void forceReload()
-            { UNIMPLEMENTED; }
+            { }
     virtual WUAction getAction() const
             { return c->getAction(); }
     virtual const char *queryActionDesc() const

+ 6 - 6
ecl/eclagent/eclagent.cpp

@@ -3368,11 +3368,6 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
     int retcode = 0;
     addAbortHandler(ControlHandler);
     cmdLineArgs.setown(createProperties(true));
-    if (argc==1)
-    {
-        usage();
-        return 2;
-    }
     for (int i = 1; i < argc; i++)
     {
         const char *arg = argv[i];
@@ -3383,6 +3378,11 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
     //get logfile location from agentexec.xml config file
     if (!standAloneExe)
     {
+        if (argc==1)
+        {
+            usage();
+            return 2;
+        }
         try
         {
             agentTopology.setown(loadConfiguration(defaultYaml, argv, "hthor", "ECLAGENT", "agentexec.xml", nullptr));
@@ -3394,7 +3394,7 @@ extern int HTHOR_API eclagent_main(int argc, const char *argv[], StringBuffer *
         }
     }
     else
-        agentTopology.setown(createPTree("hthor")); // MORE - this needs thought!
+        agentTopology.setown(loadConfiguration(defaultYaml, argv, "hthor", "ECLAGENT", nullptr, nullptr));
 
     //Build log file specification
     StringBuffer logfilespec;

+ 1 - 1
ecl/eclcc/eclcc.cpp

@@ -856,7 +856,7 @@ void EclCC::instantECL(EclCompileInstance & instance, IWorkUnit *wu, const char
                         if (optTargetClusterType==RoxieCluster)
                             generator->addLibrary("ccd");
                         else
-                            generator->addLibrary("hthor");
+                            generator->addLibrary("hthorlib");
 
 
                         compileOk = generator->generateExe(compiler);