From a66f2ac21b14b27281baa1889b74b5145e7dc33b Mon Sep 17 00:00:00 2001 From: Alexander Zaft Date: Mon, 27 Feb 2023 16:02:26 +0100 Subject: [PATCH] Remove auto-connect to 10767 on startup * not necessary with greeter * Port is default in greeter text field Change-Id: If89cb72ec6af20fd4d83488af85b942c5f54b105 Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/30531 Tested-by: Jenkins Automated Tests Reviewed-by: Alexander Zaft --- bin/frappy-gui | 2 +- frappy/gui/mainwindow.py | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/frappy-gui b/bin/frappy-gui index 276c8ea..5bec16a 100755 --- a/bin/frappy-gui +++ b/bin/frappy-gui @@ -49,7 +49,7 @@ def parseArgv(argv): action='store_true', default=False) parser.add_argument('node', help='Nodes the Gui should connect to.\n', metavar='host[:port]', - nargs='*', type=str, default=['localhost:10767']) + nargs='*', type=str, default=[]) return parser.parse_args(argv) diff --git a/frappy/gui/mainwindow.py b/frappy/gui/mainwindow.py index 53362ce..640cb6f 100644 --- a/frappy/gui/mainwindow.py +++ b/frappy/gui/mainwindow.py @@ -27,7 +27,6 @@ from frappy.gui.qt import QInputDialog, QMainWindow, QMessageBox, QObject, \ QTreeWidgetItem, pyqtSignal, pyqtSlot, QWidget, QSettings, QAction, \ QShortcut, QKeySequence from frappy.gui.util import Value, Colors, loadUi -from frappy.lib import formatExtendedTraceback from frappy.gui.logwindow import LogWindow from frappy.gui.tabwidget import TearOffTabWidget from frappy.gui.nodewidget import NodeWidget @@ -180,7 +179,6 @@ class MainWindow(QMainWindow): self._addNode(host) except Exception as e: # TODO: make this nicer than dumping to console - print(formatExtendedTraceback()) self.log.error('error in addNode: %r', e) if not self._nodes: