Merge pull request #13 from Deophius/prodtest

Doing production testing, preparing for v3.1 release

Author: Deophius

client/gui_common.py

@@ -2,14 +2,14 @@
 # Separating them from dbgui.pyw is because a py extension allows imports.
 from tkinter import *
 import dbclient, sys
+from tkinter.messagebox import *
 
 __all__ = 'IPAsker LessonPicker Reporter'.split()
 
 try:
     import json
     config = json.load(open('cli.json', encoding = 'utf-8'))
 except FileNotFoundError:
-    from tkinter.messagebox import showerror
     showerror('No config', 'Please add configuration file cli.json')
     sys.exit(1)
 
@@ -36,7 +36,7 @@ def make_widgets(self):
         self.entry.focus()
         self.entry.bind('<Return>', lambda event: self.callback())
         f2 = Frame(self)
-        self.label2 = Label(self, text = 'No machine data yet', font = 'Consolas')
+        self.label2 = Label(self, text = 'No machine data yet', font = 'Consolas', foreground = 'green')
         self.br = Entry(f2, font = 'Consolas')
         self.br.insert(0, config['defhost'])
         self.br.bind('<Return>', lambda e: self.callback())
@@ -50,9 +50,8 @@ def make_widgets(self):
         self.label2.pack(side = TOP)
 
     def callback(self):
-        from tkinter.messagebox import showerror
         try:
-            self.label2.config(text = 'Pending reply...')
+            self.label2.config(text = 'Pending reply...', foreground = 'orange')
             self.label2.update()
             self.host = self.br.get()
             self.machine_data = dbclient.get_machine_data(self.entry.get(), self.host)
@@ -65,7 +64,7 @@ def callback(self):
         except dbclient.RequestFailed as ex:
             showerror('Request failed', ex.args[1])
         # No matter what failure it is, this line will be executed.
-        self.label2.config(text = 'None machine data yet')
+        self.label2.config(text = 'None machine data yet', foreground = 'red')
         self.label2.update()
 
 class LessonPicker(Frame):
@@ -87,7 +86,8 @@ def __init__(self, lessons, host, master = None, **options):
         self.__make_widgets(lessons)
 
     def __make_widgets(self, lessons):
-        Label(self, text = "Please choose a lesson", font = 'Consolas').pack(side = TOP)
+        self.__label = Label(self, text = "Please choose a lesson", font = 'Consolas', foreground = 'green')
+        self.__label.pack(side = TOP)
         self.__var = IntVar()
         # This is actually a bunch of radio buttons
         for num, lesson in enumerate(lessons):
@@ -105,7 +105,7 @@ def __make_widgets(self, lessons):
         ok_button = Button(self, text = 'OK', command = self.__onlesson, font = "Consolas")
         ok_button.bind_all('<Return>', lambda event: self.__onlesson())
         ok_button.pack(side = TOP)
-        Label(self, text = "\nMisc operations:", font = "Consolas").pack(side = TOP)
+        Label(self, text = "\nMisc operations:", font = "Consolas", foreground = 'green').pack(side = TOP)
         pause_button = Button(self, text = "Pause watchdog", command = self.__on_pause_dog, font = "Consolas")
         pause_button.bind_all('p', lambda event: self.__on_pause_dog())
         pause_button.pack()
@@ -117,9 +117,9 @@ def __make_widgets(self, lessons):
         news_button.pack()
 
     def __onlesson(self):
-        from tkinter.messagebox import showwarning
         if self.__var.get() == -1:
             showwarning('Warning', 'You have to select a lesson!')
+            self.__label.configure(foreground = 'red', text = 'Please choose a lesson')
             return
         # Not -1, something meaningful
         self.sessid = self.__var.get()
@@ -129,13 +129,28 @@ def __onlesson(self):
         self.quit()
 
     def __on_pause_dog(self):
-        dbclient.doggie_stick(self.__host, True)
+        try:
+            dbclient.doggie_stick(self.__host, True)
+            self.__label.configure(text = "Paused watchdog", foreground = 'green')
+        except dbclient.RequestFailed as ex:
+            self.__label.configure(text = "Fail to pause dog", foreground = 'red')
+            showerror('Request failed', ex.args[1])
 
     def __on_resume_dog(self):
-        dbclient.doggie_stick(self.__host, False)
+        try:
+            dbclient.doggie_stick(self.__host, False)
+            self.__label.configure(text = "Resumed watchdog", foreground = 'green')
+        except dbclient.RequestFailed as ex:
+            self.__label.configure("Failed to resume watchdog", foreground = 'red')
+            showerror('Request failed', ex.args[1])
 
     def __on_flush_notice(self):
-        dbclient.flush_notice(self.__host)
+        try:
+            dbclient.flush_notice(self.__host)
+            self.__label.configure(text = 'Flushed notice!', foreground = 'green')
+        except dbclient.RequestFailed as ex:
+            self.__label.configure(text = 'Failed to flush notice', foreground = 'red')
+            showerror('Request failed', ex.args[1])
 
 class Reporter(Frame):
     ''' Report absent and ask who will sign in. Return value in self.signin_names,
@@ -158,8 +173,7 @@ def __init__(self, host, sessid, master = None, **options):
 
     def __getdata(self):
         ''' Gets data. Stores list of absent people in self.__absent_names '''
-        from tkinter.messagebox import askretrycancel, showerror
-        self.__label.config(text = 'Please wait a sec...')
+        self.__label.config(text = 'Please wait a sec...', foreground = 'orange')
         self.update()
         # User reply for retry, defaults to False, so when nothing special occurs,
         # doesn't retry by default
@@ -179,11 +193,10 @@ def __getdata(self):
             sys.exit(0)
 
     def __showdata(self):
-        from tkinter.messagebox import showinfo
         if len(self.__absent_names) == 0:
             showinfo('Good job!', 'Everybody has signed in! I might as well go back to sleep!')
             sys.exit(0)
-        self.__label.config(text = 'These people didn\'t DK:')
+        self.__label.config(text = 'These people didn\'t DK:', foreground = 'green')
         f = Frame(self)
         self.__listbox = Listbox(f, selectmode = EXTENDED, font = ('YaHei', 20))
         self.__listbox.insert(END, *self.__absent_names)
@@ -214,7 +227,7 @@ def __showdata(self):
 
     def __write(self):
         ''' Underlying writer.'''
-        from tkinter.messagebox import showerror, showinfo
+        self.__label.config(text = 'Sending write request to server', foreground = 'orange')
         try:
             dbclient.write_record(
                 self.__sessid,
@@ -223,29 +236,31 @@ def __write(self):
             )
         except dbclient.RequestFailed as ex:
             showerror('Request failed', ex.args[1] + '\nPlease try again.')
+            self.__label.config(foreground='red')
         except BaseException as ex:
             showerror('Unknown error', str(type(ex)) + '\n' + str(ex.args))
+            self.__label.config(foreground='red')
+        else:
+            self.__label.config(foreground = 'green')
         self.__getdata()
         if len(self.__absent_names) == 0:
             showinfo('Good job!', 'Everybody has signed in! I might as well go back to sleep!')
             sys.exit(0)
         self.__listbox.delete(0, END)
         self.__listbox.insert(END, *self.__absent_names)
-        self.__label.config(text = 'Last call OK! Choose more:')
+        self.__label.config(text = 'Choose more:')
 
     def __refresh(self):
-        from tkinter.messagebox import showinfo
         self.__getdata()
         if len(self.__absent_names) == 0:
             showinfo('Good job!', 'Everybody has signed in! I might as well go back to sleep!')
             sys.exit(0)
         self.__listbox.delete(0, END)
         self.__listbox.insert(END, *self.__absent_names)
-        self.__label.config(text = 'Refreshed! Choose more:')
+        self.__label.config(text = 'Refreshed! Choose more:', foreground = 'green')
 
     def __restart(self):
         ''' Does the communication and restarts GS terminal. '''
-        from tkinter.messagebox import showerror, askyesnocancel
         if not askyesnocancel('Restart?', 'Really restart terminal?'):
             return
         try:
@@ -257,6 +272,7 @@ def __restart(self):
         else:
             self.destroy()
             self.quit()
+        self.__label.config(text = 'Restart failed', foreground = 'red')
 
     def __find_abbrev(self):
         ''' Finds the initials in self.__quick_find and selects it.
@@ -269,13 +285,13 @@ def __find_abbrev(self):
         # We have already checked in showdata() that the config is there.
         # Just assume that it was written correctly.
         if abbrev not in config['yearbook']:
-            self.__label.configure(text = 'Abbrev not in config!')
+            self.__label.configure(text = f'{abbrev} not in config!', foreground = 'red')
             return
         try:
             index = self.__absent_names.index(config['yearbook'][abbrev])
         except ValueError:
-            self.__label.configure(text = 'Not in absent list')
+            self.__label.configure(text = f'{abbrev} not in absent list', foreground = 'red')
             return
         self.__listbox.selection_set(index)
         self.__listbox.yview_moveto(index / len(self.__absent_names))
-        self.__label.configure(text = f'Selected {abbrev}')
+        self.__label.configure(text = f'Selected {abbrev}', foreground = 'green')

cppser/app.cpp

@@ -38,6 +38,10 @@ namespace Spirit {
                 error_dialog("Type error", entry + " should be an int!"s);
                 return false;
             }
+            if (config[entry] <= 0) {
+                error_dialog("Value error", entry + " should be positive!"s);
+                return false;
+            }
             return true;
         };
         auto check_str = [&config](const char* entry) {
@@ -53,36 +57,71 @@ namespace Spirit {
         };
         return check_int("gs_port") && check_int("serv_port") && check_str("url_stu_new")
             && check_str("dbname") && check_str("passwd") && check_str("intro")
-            && check_int("watchdog_poll") && check_int("retry_wait") && check_db(config);
+            && check_int("watchdog_poll") && check_int("retry_wait") && check_int("keep_logs");
     }
 
     void error_dialog(std::string_view caption, std::string_view text) {
         ::MessageBox(NULL, text.data(), caption.data(), MB_ICONERROR);
     }
+
+    void kill_lock_mouse() {
+        std::string cmd = "taskkill.exe /f /im LockMouse.exe";
+        STARTUPINFO start;
+        ::ZeroMemory(&start, sizeof(start));
+        start.cb = sizeof(STARTUPINFO);
+        PROCESS_INFORMATION proc_info;
+        ::ZeroMemory(&proc_info, sizeof(proc_info));
+        ::CreateProcessA(
+            NULL, cmd.data(), NULL, NULL, TRUE,
+            CREATE_NO_WINDOW, NULL, NULL, &start, &proc_info
+        );
+        // Wait until child process exits.
+        ::WaitForSingleObject(proc_info.hProcess, INFINITE);
+        // Close process and thread handles. 
+        ::CloseHandle(proc_info.hProcess);
+        ::CloseHandle(proc_info.hThread);
+    }
 }
 
 int main() {
     using namespace Spirit;
     hide_window();
     Configuration config;
-    std::ifstream istr("man.json");
-    if (!istr) {
-        error_dialog("Config error", "Cannot open the configuration!");
-        return 1;
-    }
-    try {
-        istr >> config;
-    } catch (const decltype(config)::parse_error& ex) {
-        error_dialog("Config error", ex.what());
-        return 1;
-    }
-    istr.close();
-    if (!validate(config)) {
-        error_dialog("Config error", "Error with the man.json configuration file!");
-        return 1;
+    {
+        // Put these into a new scope to ensure the log will be closed when entering singer
+        // First override the old contents here. The singer will open a new config.
+        Logfile logfile("startup.log");
+        logfile << "About to kill the lock mouse" << std::endl;
+        kill_lock_mouse();
+        logfile << "Called kill_lock_mouse, last error was " << ::GetLastError() << std::endl;
+        std::ifstream istr("man.json");
+        if (!istr) {
+            logfile << "Cannot open configuration file, exiting.\n";
+            error_dialog("Config error", "Cannot open the configuration!");
+            return 1;
+        }
+        try {
+            istr >> config;
+        } catch (const decltype(config)::parse_error& ex) {
+            error_dialog("Config error", ex.what());
+            logfile << "Config error: " << ex.what();
+            return 1;
+        }
+        istr.close();
+        if (!validate(config)) {
+            error_dialog("Config error", "Error with the man.json configuration file!");
+            logfile << "Config error: didn't pass the validator test\n";
+            return 1;
+        }
+        if (!check_db(config))
+            logfile << "Warning: database is corrupt!\n";
     }
+    // Now we can be absolutely sure that keep_logs exist and is larger than 0.
+    auto logname = select_logfile("singer", config["keep_logs"]);
+    std::filesystem::rename("startup.log", logname);
+    Logfile logfile(logname, std::ios::out | std::ios::app);
     Watchdog watchdog(config);
     Singer singer(config);
     watchdog.start();
-    singer.mainloop(watchdog);
+    singer.mainloop(watchdog, logfile);
 }

cppser/app.h

@@ -15,6 +15,9 @@ namespace Spirit {
 
     // Displays an error message.
     void error_dialog(std::string_view caption, std::string_view text);
+
+    // Kills the lock mouse "utility".
+    void kill_lock_mouse();
 }
 
 // Main function for the spirit program.

cppser/dog_helper.cpp

@@ -1,6 +1,8 @@
 #include "singd.h"
+#include <array>
+#include <algorithm>
 #include <boost/asio.hpp>
-#include <exception>
+#include <iterator>
 #include <memory>
 #include <regex>
 
@@ -142,19 +144,53 @@ namespace Spirit {
             throw NetworkError("execute_request timed out.");
     }
 
-    void send_to_gs(const Configuration& config, Logfile& log, const std::string& msg) {
+    static void send_to_gs_impl(int gs_port, std::string msg, std::shared_ptr<std::promise<std::string>> prom) {
         namespace asio = boost::asio;
         asio::io_context ioc;
         asio::ip::udp::socket socket(ioc);
         socket.open(asio::ip::udp::v4());
-        asio::ip::udp::endpoint addr(
-            asio::ip::address::from_string("127.0.0.1"), config["gs_port"].get<int>()
-        );
+        asio::ip::udp::endpoint addr(asio::ip::address::from_string("127.0.0.1"), gs_port);
+        std::exception_ptr exptr;
         try {
-            socket.send_to(asio::buffer(msg), addr);
+            socket.send_to(asio::buffer(std::move(msg)), addr);
+            std::array<char, 128> buff;
+            asio::ip::udp::endpoint endpoint;
+            auto n = socket.receive_from(asio::buffer(buff), endpoint);
+            prom->set_value(std::string(buff.begin(), n));
+            return;
         } catch (const boost::system::system_error& ex) {
-            log << ex.what() << '\n';
-            throw ex;
+            try {
+                if (ex.code().value() == asio::error::connection_reset)
+                    throw NetworkError("Connection was reset, maybe GS not up?");
+                else
+                    throw NetworkError("Network error " + std::to_string(ex.code().value()));
+            } catch (const NetworkError& ex2) {
+                // Set it to the promise
+                try {
+                    prom->set_exception(std::current_exception());
+                } catch (...) {
+                    // Nothing to do.
+                }
+            }
         }
     }
+
+    void send_to_gs(const Configuration& config, Logfile& log, const std::string& msg) {
+        log << "Sending message to GS: " << msg << '\n';
+        using Promise = std::promise<std::string>;
+        std::shared_ptr<Promise> prom(new Promise());
+        auto fut = prom->get_future();
+        // Launch the detached thread
+        std::thread(&send_to_gs_impl, config["gs_port"].get<int>(), msg, prom).detach();
+        auto stat = fut.wait_for(std::chrono::seconds(2));
+        if (stat == std::future_status::ready) {
+            // This line might throw NetworkError
+            std::string_view line = std::move(fut.get());
+            if (line.substr(0, 7) != "success")
+                throw GSError(line.data());
+            // Success, return
+            return;
+        } else
+            throw NetworkError("Sending to GS timed out");
+    }
 }