Fix merge errors

xplugin/main.cpp

@@ -116,10 +116,11 @@ PLUGIN_API int XPluginStart(char *outName, char *outSig, char *outDesc)
 
   try {
     connector = std::make_unique<germanairlinesva_websocket::Websocket>(
-        "wss://ws.hofmannnet.myhome-server.de:8000",
+        "ss://ws.hofmannnet.myhome-server.de:8000",
         configuration->getUser(),
         toLog);
   } catch (const std::invalid_argument &e) {
+    toLog("SOCK");
     toLog(e.what());
     return 0;
   }
@@ -146,9 +147,55 @@ PLUGIN_API int XPluginStart(char *outName, char *outSig, char *outDesc)
     ap2.first.size() == 0 ? toLog("  SUCCESS") : toLog("  ERROR");
   }
 
-  delete connector.release();
-  delete database.release();
-  delete configuration.release();
+  // Thread for sending data to websocket
+  serverThread = std::thread(&serverWorker);
+  recordingThread = std::thread(&recordingWorker);
+  toLog("Workers started");
+
+  toLog("Logbook Test");
+  germanairlinesva::file::logbook::Logbook logbook;
+  logbook.addEntry("08.09.2022",
+                   "1000",
+                   "L049",
+                   "D-ALFA",
+                   "John F. Kennedy International Aiport / EDDF",
+                   "A1",
+                   "14L",
+                   "Gander International Airport / CYQX",
+                   "10",
+                   "03",
+                   "10:00",
+                   "10:20",
+                   "13:20",
+                   "13:30",
+                   210.5,
+                   20.1,
+                   5012.4156,
+                   8.87,
+                   5041.3856,
+                   7.1,
+                   971.14,
+                   2.41,
+                   980.65,
+                   -165.23,
+                   1,
+                   1.2012,
+                   "2022-09-08_VGA1000",
+                   5.5,
+                   1);
+  logbook.toFile();
+
+  return 1;
+}
+
+PLUGIN_API void XPluginStop(void)
+{
+  /* Flight Loop */
+  XPLMUnregisterFlightLoopCallback(flightLoop, nullptr);
+  /* End threads */
+  wantsExit = true;
+  serverThread.join();
+  recordingThread.join();
 
   delete connector.release();
   delete database.release();