Compare commits
No commits in common. "master" and "1.5.5" have entirely different histories.
@ -146,10 +146,7 @@ DEFINES += QT_DEPRECATED_WARNINGS
|
||||
# syncCustomerRepositoryAndFS().
|
||||
# 1.5.5 : Call into binary ptuPackageVersion to get installed package
|
||||
# versions.
|
||||
# 1.5.6 : Show additional update progress info in status bar.
|
||||
# 1.5.7 : Add support for dynamic portrait / landscape.
|
||||
# 1.5.8 : Use EVENT_ID=<pid of update-tool> for CMD_EVENT.
|
||||
VERSION="1.5.8"
|
||||
VERSION="1.5.5"
|
||||
# PLANNED TODOS:
|
||||
# 1: Das Repository wird repariert bwz. neu geklont. Unabhaengig vom WAIT.
|
||||
# 2: Wenn der WAIT-Button aktiv ist, dann wird ein Repository repariert (neu
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
#include <QThread>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QCoreApplication>
|
||||
|
||||
#if 0
|
||||
########################
|
||||
@ -381,7 +380,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
|
||||
"{"
|
||||
"\"REASON\":\"SW_UP\","
|
||||
"\"TIMESTAMP\":\"%s\","
|
||||
"\"EVENT_ID\":\"%d\","
|
||||
"\"EVENT_ID\":\"0\","
|
||||
"\"EVENT\":\"%s\","
|
||||
"\"EVENTSTATE\":1,"
|
||||
"\"PARAMETER\": {"
|
||||
@ -391,7 +390,7 @@ QString IsmasClient::updateNewsToIsmas(char const *event,
|
||||
"\"STEP_RESULT\" : \"%s\","
|
||||
"\"VERSION\" : \"%s\""
|
||||
"}"
|
||||
"}", ts.toStdString().c_str(), static_cast<int>(QCoreApplication::applicationPid()), event, percent, resultCode,
|
||||
"}", ts.toStdString().c_str(), event, percent, resultCode,
|
||||
step, step_result, version);
|
||||
return buf;
|
||||
}
|
||||
|
||||
@ -12,9 +12,6 @@
|
||||
#include <QScrollBar>
|
||||
#include <QEvent>
|
||||
|
||||
#include <QScreen>
|
||||
|
||||
|
||||
|
||||
MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
: QMainWindow(parent)
|
||||
@ -33,7 +30,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
this->statusBar()->setFont(f);
|
||||
|
||||
ui->setupUi(this);
|
||||
checkOrientation();
|
||||
|
||||
ui->updateProgress->setRange(0, 100);
|
||||
ui->updateProgress->reset();
|
||||
@ -63,24 +59,6 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
m_exitTimer->setSingleShot(true);
|
||||
m_exitTimer->start(1800 * 1000);
|
||||
|
||||
m_statusTimer = new QTimer(this);
|
||||
if (m_statusTimer) {
|
||||
connect(m_statusTimer, &QTimer::timeout, [this]() {
|
||||
static QString p(".");
|
||||
QTime const &t = QDateTime::currentDateTime().time();
|
||||
QString s = t.toString(Qt::ISODate);
|
||||
s += ": Update might take several minutes " + p;
|
||||
if (p.length() >= 5) {
|
||||
p = ".";
|
||||
} else {
|
||||
p += ".";
|
||||
}
|
||||
this->statusBar()->showMessage(s);
|
||||
});
|
||||
m_statusTimer->setSingleShot(false);
|
||||
m_statusTimer->start(1000);
|
||||
}
|
||||
|
||||
connect(ui->exit, SIGNAL(clicked()),this,SLOT(onQuit()));
|
||||
connect(m_worker, SIGNAL(disableExit()),this,SLOT(onDisableExit()));
|
||||
connect(m_worker, SIGNAL(enableExit()),this,SLOT(onEnableExit()));
|
||||
@ -98,60 +76,9 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
|
||||
MainWindow::~MainWindow() {
|
||||
delete m_startTimer;
|
||||
delete m_exitTimer;
|
||||
delete m_statusTimer;
|
||||
delete ui;
|
||||
}
|
||||
|
||||
|
||||
// ----------------------------- Ui::LAYOUT setting -------------------------------------
|
||||
|
||||
void MainWindow::checkOrientation()
|
||||
{
|
||||
QScreen *screen = QGuiApplication::primaryScreen();
|
||||
Qt::ScreenOrientation orientation = screen->orientation();
|
||||
|
||||
switch (orientation) {
|
||||
case Qt::PrimaryOrientation:
|
||||
this->setLandscapeLayout();
|
||||
break;
|
||||
case Qt::LandscapeOrientation:
|
||||
this->setLandscapeLayout();
|
||||
break;
|
||||
case Qt::PortraitOrientation:
|
||||
this->setPortraitLayout();
|
||||
break;
|
||||
case Qt::InvertedLandscapeOrientation:
|
||||
this->setLandscapeLayout();
|
||||
break;
|
||||
case Qt::InvertedPortraitOrientation:
|
||||
this->setPortraitLayout();
|
||||
break;
|
||||
}
|
||||
|
||||
this->currentOrientation = orientation;
|
||||
}
|
||||
|
||||
|
||||
|
||||
void MainWindow::setPortraitLayout()
|
||||
{
|
||||
// Adjust layout for portrait mode (480x800)
|
||||
this->setFixedSize(480, 800);
|
||||
ui->centralwidget->setFixedSize(480, 800);
|
||||
}
|
||||
|
||||
void MainWindow::setLandscapeLayout()
|
||||
{
|
||||
// Adjust layout for landscape mode (800x480)
|
||||
this->setFixedSize(800, 480);
|
||||
ui->centralwidget->setFixedSize(800, 480);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
void MainWindow::customEvent(QEvent *event) {
|
||||
if (event->type() == ProgressEvent::type()) {
|
||||
ProgressEvent *pevent = (ProgressEvent *)event;
|
||||
|
||||
@ -66,12 +66,6 @@ private:
|
||||
void onShowMessage(QString, QString);
|
||||
|
||||
Ui::MainWindow *ui;
|
||||
void checkOrientation();
|
||||
void setPortraitLayout();
|
||||
void setLandscapeLayout();
|
||||
Qt::ScreenOrientation currentOrientation;
|
||||
|
||||
|
||||
Worker *m_worker;
|
||||
int const m_width;
|
||||
QTimer *m_startTimer;
|
||||
@ -79,6 +73,5 @@ private:
|
||||
bool m_progressRunning;
|
||||
//int m_progressValue;
|
||||
UpdateDcEvent::UpdateStep m_updateStep;
|
||||
QTimer *m_statusTimer;
|
||||
};
|
||||
#endif // MAINWINDOW_H
|
||||
|
||||
@ -10,12 +10,6 @@
|
||||
<height>480</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>480</width>
|
||||
<height>480</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Source Code Pro</family>
|
||||
@ -25,47 +19,55 @@
|
||||
<string>MainWindow</string>
|
||||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="3" column="2">
|
||||
<widget class="QPushButton" name="exit">
|
||||
<property name="text">
|
||||
<string>Exit</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QProgressBar" name="updateProgress">
|
||||
<property name="value">
|
||||
<number>1</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" rowspan="3" colspan="3">
|
||||
<widget class="QTextEdit" name="updateStatus">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Misc Fixed</family>
|
||||
<pointsize>11</pointsize>
|
||||
<weight>75</weight>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="verticalScrollBarPolicy">
|
||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||
</property>
|
||||
<property name="horizontalScrollBarPolicy">
|
||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
</layout>
|
||||
<widget class="QWidget" name="layoutWidget">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>10</x>
|
||||
<y>10</y>
|
||||
<width>781</width>
|
||||
<height>441</height>
|
||||
</rect>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="3" column="2">
|
||||
<widget class="QPushButton" name="exit">
|
||||
<property name="text">
|
||||
<string>Exit</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QProgressBar" name="updateProgress">
|
||||
<property name="value">
|
||||
<number>1</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" rowspan="3" colspan="3">
|
||||
<widget class="QTextEdit" name="updateStatus">
|
||||
<property name="enabled">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="font">
|
||||
<font>
|
||||
<family>Misc Fixed</family>
|
||||
<pointsize>11</pointsize>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="verticalScrollBarPolicy">
|
||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||
</property>
|
||||
<property name="horizontalScrollBarPolicy">
|
||||
<enum>Qt::ScrollBarAsNeeded</enum>
|
||||
</property>
|
||||
<property name="sizeAdjustPolicy">
|
||||
<enum>QAbstractScrollArea::AdjustToContents</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</widget>
|
||||
</widget>
|
||||
<resources/>
|
||||
|
||||
@ -1,184 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
# set -x
|
||||
|
||||
#
|
||||
#############################################################################
|
||||
# Check if the ATBUpdateTool(.service) did not send U0001 (sucess),
|
||||
# U0002 (activated) or U0003 (error) to ISMAS, including the case that the
|
||||
# tool did not crash or was not killed under other circumstances.
|
||||
#
|
||||
# This script will be called in the associated atbupdatetool.service (see
|
||||
# /lib/systemd/system/atbupdatetool.service).
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
readonly OUT_FILE=/tmp/out.txt
|
||||
readonly SCRIPT_NAME=$(basename $0)
|
||||
|
||||
if [ -z "$START_DATE" ]
|
||||
then
|
||||
START_DATE=$(date +"%Y-%m-%d00:00:00")
|
||||
fi
|
||||
|
||||
if [ -z "$STOP_DATE" ]
|
||||
then
|
||||
STOP_DATE=$(date +"%Y-%m-%d%H:%M:%S")
|
||||
fi
|
||||
|
||||
echo "EXIT_CODE=$EXIT_CODE"
|
||||
echo "SERVICE_RESULT=$SERVICE_RESULT"
|
||||
echo "EXIT_STATUS=$EXIT_STATUS"
|
||||
echo "START_DATE=$START_DATE"
|
||||
echo "STOP_DATE=$STOP_DATE"
|
||||
|
||||
|
||||
last_cmd_event () {
|
||||
# output json; look for start of CMD_EVENT; look for }}; extract everything between; finally re-add }}.
|
||||
# could also look for ">>>", but this might change in the future.
|
||||
local json=$(\
|
||||
journalctl -u atbupdatetool --since="$START_DATE" --until="$STOP_DATE" --output=json-pretty |\
|
||||
grep "#M=APISM#C=CMD_EVENT#J=" |\
|
||||
awk '{split($0, a, "#M=APISM#C=CMD_EVENT#J="); print a[2]}' |\
|
||||
awk '{split($0, a, /\}[\s]*\}/); print a[1]}' |\
|
||||
tr -d '\\' |\
|
||||
tail -1)
|
||||
json+="}}"
|
||||
echo "$json"
|
||||
}
|
||||
|
||||
last_percent_value () {
|
||||
echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\3/p" | xargs | awk '{print $NF}')
|
||||
}
|
||||
|
||||
last_step () {
|
||||
echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[8]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
|
||||
}
|
||||
|
||||
last_step_result () {
|
||||
echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[9]}' | awk '{split($0, b, " : "); print b[2]}' | tr -d '"\\')
|
||||
}
|
||||
|
||||
pid_atbupdatetool () {
|
||||
echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(ATBUpdateTool\[\)\(\\s*[0-9]\+\)\(\].*$\)/\3/p" | uniq)
|
||||
}
|
||||
|
||||
last_event () {
|
||||
echo $(cat $OUT_FILE | sed -n "s/\(^.*\)\(\"PERCENT\"\\s*:\)\(\\s*[0-9]\+\)\(.*$\)/\1\2\3\4/p" | tail -1 | awk '{split($0, a, ","); print a[4]}' | awk '{split($0, b, ":"); print b[2]}' | tr -d ' ' | tr -d '"\\')
|
||||
}
|
||||
|
||||
sendU0003 () {
|
||||
LAST_CMD_EVENT=$(last_cmd_event)
|
||||
echo "LAST=$LAST_CMD_EVENT"
|
||||
|
||||
local json_detected=0
|
||||
local temp
|
||||
local x
|
||||
|
||||
if [[ ! -z "$LAST_CMD_EVENT" ]]
|
||||
then
|
||||
temp=$(mktemp -p /tmp)
|
||||
echo "$LAST_CMD_EVENT" > "$temp"
|
||||
x=$(jq .EVENT $temp)
|
||||
if [ $? -eq 0 ]; then
|
||||
json_detected=1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ $json_detected -eq 1 ]
|
||||
then
|
||||
# local pid=$(jq .EVENT_ID $temp)
|
||||
|
||||
# if json has been detected, use "jq".
|
||||
|
||||
x=$(jq .PARAMETER.PERCENT $temp | tr -d '"')
|
||||
[[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
|
||||
|
||||
x=$(jq .PARAMETER.STEP $temp | tr -d '"')
|
||||
[[ -z "$x" ]] && STEP="unknown" || STEP="$x"
|
||||
|
||||
x=$(jq .PARAMETER.STEP_RESULT $temp | tr -d '"')
|
||||
[[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
|
||||
|
||||
x=$(pid_atbupdatetool)
|
||||
[[ -z "$x" ]] && PID=99999 || PID=$x
|
||||
|
||||
x=$(last_event)
|
||||
[[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
|
||||
|
||||
else
|
||||
# cannot parse valid json. try original journal text file.
|
||||
|
||||
x=$(last_percent_value)
|
||||
[[ -z "$x" ]] && PERCENT=0 || PERCENT=$x
|
||||
|
||||
x=$(last_step)
|
||||
[[ -z "$x" ]] && STEP="unknown" || STEP="$x"
|
||||
|
||||
x=$(last_step_result)
|
||||
[[ -z "$x" ]] && STEP_RESULT="unknown" || STEP_RESULT="$x"
|
||||
|
||||
x=$(pid_atbupdatetool)
|
||||
[[ -z "$x" ]] && PID=99999 || PID=$x
|
||||
|
||||
x=$(last_event)
|
||||
[[ -z "$x" ]] && EVENT="unknown" || EVENT="$x"
|
||||
fi
|
||||
|
||||
echo "PERCENT=$PERCENT"
|
||||
echo "STEP=$STEP"
|
||||
echo "STEP_RESULT=$STEP_RESULT"
|
||||
echo "PID=$PID"
|
||||
echo "EVENT=$EVENT"
|
||||
|
||||
# build json to be sent to ISMAS with "U0003"
|
||||
|
||||
CURRENT_DATE=$(date +"%Y-%m-%d %H:%M:%S.000%z")
|
||||
U0003Msg="{\
|
||||
\"REASON\":\"SW_UP\",\
|
||||
\"TIMESTAMP\":\"$CURRENT_DATE\",\
|
||||
\"EVENT_ID\":\"$PID\",\
|
||||
\"EVENT\":\"U0003\",\
|
||||
\"EVENTSTATE\":1,\
|
||||
\"PARAMETER\": {\
|
||||
\"PERCENT\" : $PERCENT,\
|
||||
\"RESULTCODE\" : 99,\
|
||||
\"STEP\" : \"$1 -> monitored last step: $STEP\",\
|
||||
\"STEP_RESULT\" : \"$1 -> monitored last step result: $STEP_RESULT\",\
|
||||
\"VERSION\" : \"\"\
|
||||
}\
|
||||
}"
|
||||
|
||||
echo -e "U0003Msg=$U0003Msg"
|
||||
|
||||
(echo "#M=APISM#C=CMD_EVENT#J=$U0003Msg"; sleep 5) | nc localhost 7777
|
||||
}
|
||||
|
||||
# save journal for the last run of atbupdatetool in $OUT_FILE
|
||||
echo $(journalctl -u atbupdatetool --since="$START_DATE" --until=$STOP_DATE) > $OUT_FILE
|
||||
|
||||
if [[ "$EXIT_CODE" = "exited" && "$SERVICE_RESULT" = "success" && "$EXIT_STATUS" = "0" ]]
|
||||
then
|
||||
# almost normal run; at least there was no crash.
|
||||
if cat $OUT_FILE | grep -o "U0003" | wc -l; then
|
||||
echo "$SCRIPT_NAME: Failure code U0003 already sent to ISMAS"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if cat $OUT_FILE | grep -o "U0002" | wc -l; then
|
||||
echo "$SCRIPT_NAME: Success code U0002 already sent to ISMAS"
|
||||
exit 0
|
||||
else
|
||||
sendU0003 "$SCRIPT_NAME: Success code U0002 not sent to ISMAS"
|
||||
fi
|
||||
|
||||
if cat $OUT_FILE | grep -o "U0001" | wc -l; then
|
||||
echo "$SCRIPT_NAME: Success code U0001 already sent to ISMAS"
|
||||
exit 0
|
||||
else
|
||||
sendU0003 "$SCRIPT_NAME: Success code U0001 not sent to ISMAS"
|
||||
fi
|
||||
else
|
||||
# something unexpected has happened.
|
||||
sendU0003 "$SCRIPT_NAME: EXIT_CODE=$EXIT_CODE;SERVICE_RESULT=$SERVICE_RESULT;EXIT_STATUS=$EXIT_STATUS"
|
||||
fi
|
||||
Loading…
x
Reference in New Issue
Block a user