Adding a lot of heartbeating and OOBE work

This commit is contained in:
Rick Falkvinge
2017-01-16 22:09:09 +01:00
parent 789b06359d
commit adeeece59a
12 changed files with 138 additions and 347 deletions
+1 -2
View File
@@ -121,8 +121,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<None Include="etcinitd\etcinitd-swarmops-backend" />
<None Include="etcsystemd\swarmops-backend.service" />
<None Include="libsystemd\swarmops-backend.service" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup />
+14 -1
View File
@@ -4,6 +4,7 @@ using System.Globalization;
using System.Threading;
using Mono.Unix;
using Mono.Unix.Native;
using Swarmops.Common.ExtensionMethods;
using Swarmops.Database;
using Swarmops.Logic.Communications;
using Swarmops.Logic.Communications.Payload;
@@ -25,7 +26,18 @@ namespace Swarmops.Backend
private static void Main (string[] args)
{
// Checking for schemata upgrade first of all
// Are we running yet?
if (!SystemSettings.DatabaseInitialized)
{
// will restart the service every 30s until db initialized on OOBE
// also, the read of DatabaseInitialized can and will fail if
// we're not initalized enough to even have a database
throw new InvalidOperationException();
}
// Checking for schemata upgrade first of all, after seeing that db exists
DatabaseMaintenance.UpgradeSchemata();
@@ -315,6 +327,7 @@ namespace Swarmops.Backend
{
BotLog.Write (0, "MainCycle", "Ten-second entry");
SystemSettings.HeartbeatBackend = (ulong) DateTime.UtcNow.ToUnix();
CommsTransmitter.Run();
try
-164
View File
@@ -1,164 +0,0 @@
#! /bin/bash
### BEGIN INIT INFO
# Provides: swarmops-backend
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Swarmops backend
# Description: This file starts and stops the Swarmsops backend. It is installed as part of
# the swarmops-backend package and placed in /etc/init.d for compatibility with
# Debian and Ubuntu servers.
### END INIT INFO
# Author: Rick Falkvinge <rick.falkvinge@pirateacademy.eu>
#
# Please remove the "Author" lines above and replace them
# with your own name if you copy and modify this script.
# Do NOT "set -e"
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/usr/sbin:/usr/bin:/sbin:/bin
DESC="Swarmops Backend"
NAME=Swarmops.Backend.exe
MONO=/usr/bin/mono
RUNDIR=/usr/share/swarmops/backend
DAEMON=$RUNDIR/$NAME
DAEMON_ARGS=""
PIDFILE=/var/run/$NAME.pid
VARDIR=/var/run/swarmops
SCRIPTNAME=/etc/init.d/$NAME
KILLFILE=$RUNDIR/swarmops-backend-exit.flag
USRID="swarmops"
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
# Define LSB log_* functions.
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
# and status_of_proc is working.
. /lib/lsb/init-functions
#
# Function that starts the daemon/service
#
do_start()
{
# Return
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $MONO \
--make-pidfile --chuid $USRID --chdir $RUNDIR --background --te$
|| return 1
start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $MONO \
--make-pidfile --chuid $USRID --chdir $RUNDIR --background -- $$
|| return 2
# Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend
# on this one. As a last resort, sleep for some time.
}
#
# Function that stops the daemon/service
#
do_stop()
{
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
PID=$(cat $PIDFILE)
touch $KILLFILE
for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20; do
if [ ! -d /proc/$PID ]; then
rm -f $PIDFILE
return 0
fi
sleep 1
done
return 2
}
#
# Function that sends a SIGHUP to the daemon/service
#
do_reload() {
#
# If the daemon can reload its configuration without
# restarting (for example, when it is sent a SIGHUP),
# then implement that here.
#
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
return 0
}
case "$1" in
start)
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
stop)
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
#reload|force-reload)
#
# If do_reload() is not implemented then leave this commented out
# and leave 'force-reload' as an alias for 'restart'.
#
#log_daemon_msg "Reloading $DESC" "$NAME"
#do_reload
#log_end_msg $?
#;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
# 'force-reload' alias
#
log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
case "$?" in
0|1)
do_start
case "$?" in
0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running
*) log_end_msg 1 ;; # Failed to start
esac
;;
*)
# Failed to stop
log_end_msg 1
;;
esac
;;
*)
#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 3
;;
esac
:
-170
View File
@@ -1,170 +0,0 @@
#! /bin/sh
### BEGIN INIT INFO
# Provides: swarmops-backend
# Required-Start: $remote_fs $syslog
# Required-Stop: $remote_fs $syslog
# Default-Start: 2 3 4 5
# Default-Stop: 0 1 6
# Short-Description: Swarmops backend
# Short-Description: Swarmops backend
# Description: This file starts and stops the Swarmsops backend. It is installed as part of
# the swarmops-backend package and placed in /etc/init.d for compatibility with
# Debian and Ubuntu servers.
### END INIT INFO
# Author: Rick Falkvinge <rick.falkvinge@pirateacademy.eu>
#
# Please remove the "Author" lines above and replace them
# with your own name if you copy and modify this script.
# Do NOT "set -e"
# PATH should only include /usr/* if it runs after the mountnfs.sh script
PATH=/sbin:/usr/sbin:/bin:/usr/bin
DESC="Swarmops backend daemon"
NAME=swarmops-back
BINARY=Swarmops.Backend.exe
MONO=/usr/bin/mono
DAEMON=/usr/share/swarmops/backend
DAEMON_ARGS="--options args"
PIDFILE=/var/run/swarmops-backend.pid
SCRIPTNAME=/etc/init.d/swarmops-backend
LOGDIR=/var/log/swarmops
# Exit if the package is not installed
[ -x "$DAEMON" ] || exit 0
# Read configuration variable file if it is present
[ -r /etc/default/$NAME ] && . /etc/default/$NAME
# Assert that log dir exists
if [ ! -d $LOGDIR ]; then
mkdir $LOGDIR
fi
# Load the VERBOSE setting and other rcS variables
. /lib/init/vars.sh
# Define LSB log_* functions.
# Depend on lsb-base (>= 3.2-14) to ensure that this file is present
# and status_of_proc is working.
. /lib/lsb/init-functions
#
# Function that starts the daemon/service
#
do_start()
{
# Return
# 0 if daemon has been started
# 1 if daemon was already running
# 2 if daemon could not be started
echo "Starting Swarmops backend..."
start-stop-daemon --start --pidfile $PIDFILE --exec $MONO --make-pidfile --chdir $DAEMON --name $NAME --background --test $DAEMON/$BINARY > /dev/null \
|| return 1
start-stop-daemon --start --pidfile $PIDFILE --exec $MONO --make-pidfile --chdir $DAEMON --name $NAME --background $DAEMON/$BINARY \
|| return 2
# Add code here, if necessary, that waits for the process to be ready
# to handle requests from services started subsequently which depend
# on this one. As a last resort, sleep for some time.
}
#
# Function that stops the daemon/service
#
do_stop()
{
# Return
# 0 if daemon has been stopped
# 1 if daemon was already stopped
# 2 if daemon could not be stopped
# other if a failure occurred
echo "Stopping Swarmops backend..."
start-stop-daemon --stop --retry=TERM/120/KILL/5 --pidfile $PIDFILE
RETVAL="$?"
[ "$RETVAL" = 2 ] && return 2
# Wait for children to finish too if this is a daemon that forks
# and if the daemon is only ever run from this initscript.
# If the above conditions are not satisfied then add some other code
# that waits for the process to drop all resources that could be
# needed by services started subsequently. A last resort is to
# sleep for some time.
start-stop-daemon --stop --quiet --oknodo --retry=0/120/KILL/5 --exec $DAEMON
[ "$?" = 2 ] && return 2
# Many daemons don't delete their pidfiles when they exit.
rm -f $PIDFILE
return "$RETVAL"
}
#
# Function that sends a SIGHUP to the daemon/service
#
do_reload() {
#
# If the daemon can reload its configuration without
# restarting (for example, when it is sent a SIGHUP),
# then implement that here.
#
start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME
return 0
}
case "$1" in
start)
[ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC" "$NAME"
do_start
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
stop)
[ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME"
do_stop
case "$?" in
0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;;
2) [ "$VERBOSE" != no ] && log_end_msg 1 ;;
esac
;;
status)
status_of_proc "$DAEMON" "$NAME" && exit 0 || exit $?
;;
#reload|force-reload)
#
# If do_reload() is not implemented then leave this commented out
# and leave 'force-reload' as an alias for 'restart'.
#
#log_daemon_msg "Reloading $DESC" "$NAME"
#do_reload
#log_end_msg $?
#;;
restart|force-reload)
#
# If the "reload" option is implemented then remove the
# 'force-reload' alias
#
log_daemon_msg "Restarting $DESC" "$NAME"
do_stop
case "$?" in
0|1)
do_start
case "$?" in
0) log_end_msg 0 ;;
1) log_end_msg 1 ;; # Old process is still running
*) log_end_msg 1 ;; # Failed to start
esac
;;
*)
# Failed to stop
log_end_msg 1
;;
esac
;;
*)
#echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2
echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
exit 3
;;
esac
:
+2 -1
View File
@@ -6,7 +6,8 @@ After=network.target
User=root
ExecStart=/usr/bin/mono /usr/share/swarmops/backend/Swarmops.Backend.exe
WorkingDirectory=/usr/share/swarmops/backend
Restart=on-abort
Restart=on-failure
RestartSec=30
[Install]
+2 -2
View File
@@ -5,11 +5,11 @@ namespace Swarmops.Common.ExtensionMethods
{
public static partial class DummyWrapper
{
public static Int32 ToUnix (this DateTime source)
public static UInt64 ToUnix (this DateTime source)
{
// Assumes DateTime is already UTC
return (Int32)(source.Subtract(new DateTime(1970, 1, 1, 0, 0, 0,DateTimeKind.Utc))).TotalSeconds;
return (UInt64)(source.Subtract(new DateTime(1970, 1, 1, 0, 0, 0,DateTimeKind.Utc))).TotalSeconds;
}
public static bool IsHigh(this DateTime source)
+1 -1
View File
@@ -62,7 +62,7 @@
</ItemGroup>
<ItemGroup>
<None Include="App.config" />
<None Include="etcsystemd\swarmops-frontend.service" />
<None Include="libsystemd\swarmops-frontend.service" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
+13
View File
@@ -21,6 +21,17 @@ namespace Swarmops.Frontend.Socket
{
static void Main(string[] args)
{
// Are we running yet?
if (!SystemSettings.DatabaseInitialized)
{
// will restart the service every 30s until db initialized on OOBE
// also, the read of DatabaseInitialized can and will fail if
// we're not initalized enough to even have a database
throw new InvalidOperationException();
}
// Check if we're Sandbox
if (PilotInstallationIds.IsPilot(PilotInstallationIds.DevelopmentSandbox))
@@ -163,6 +174,8 @@ namespace Swarmops.Frontend.Socket
private static void OnEveryTenSeconds()
{
SystemSettings.HeartbeatFrontend = DateTime.UtcNow.ToUnix();
_socketServer.WebSocketServices.Broadcast ("{\"messageType\":\"Heartbeat\"}");
if (_isSandbox)
@@ -6,7 +6,8 @@ After=network.target
User=root
ExecStart=/usr/bin/mono /usr/share/swarmops/frontend/bin/Swarmops.Frontend.Socket.exe
WorkingDirectory=/usr/share/swarmops/frontend
Restart=on-abort
Restart=on-failure
RestartSec=30
[Install]
WantedBy=multi-user.target
+59
View File
@@ -222,6 +222,65 @@ namespace Swarmops.Logic.Support
}
public static UInt64 HeartbeatBackend
{
get
{
string result = Persistence.Key["HeartbeatBackend"];
if (!string.IsNullOrEmpty(result))
{
try
{
return UInt64.Parse(result);
}
catch (Exception)
{
return 0;
}
}
return 0;
}
set
{
Persistence.Key["HeartbeatBackend"] = value.ToString(CultureInfo.InvariantCulture);
}
}
public static UInt64 HeartbeatFrontend
{
get
{
string result = Persistence.Key["HeartbeatFrontend"];
if (!string.IsNullOrEmpty(result))
{
try
{
return UInt64.Parse(result);
}
catch (Exception)
{
return 0;
}
}
return 0;
}
set
{
Persistence.Key["HeartbeatFrontend"] = value.ToString(CultureInfo.InvariantCulture);
}
}
public static bool DatabaseInitialized
{
get { return !String.IsNullOrEmpty(InstallationId); }
}
public static string EtcFolder
{
get
+15 -3
View File
@@ -16,6 +16,7 @@
<!-- fonts -->
<link href='https://fonts.googleapis.com/css?family=Permanent+Marker' rel='stylesheet' type='text/css' />
<link href='https://fonts.googleapis.com/css?family=Ubuntu:light,regular,500,bold' rel='stylesheet' type='text/css' />
<link href='https://fonts.googleapis.com/css?family=Ubuntu+Mono:500' rel='stylesheet' type='text/css' />
<link href='https://fonts.googleapis.com/css?family=Arimo:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css' />
<!-- page title -->
@@ -760,9 +761,20 @@
</div>
</div>
<div id="step-5" style="display:none">
<h2>All done - ready to login</h2>
<p>Your Swarmops installation is ready! Press Finish to log in as your new user and start using it.</p>
<div style="display:none"><asp:Button UseSubmitBehavior="false" runat="server" ID="ButtonLogin" OnClick="ButtonLogin_Click" Text="This button is invisible."/></div>
<div id="DivStartServers">
<h2>Start the two server processes</h2>
<p><strong>Start the Swarmops Frontend server</strong></p>
<p>The site needs a socket daemon to operate. Start the process now with the command:</p>
<p><span style="font-family: Ubuntu Mono">systemctl start swarmops-frontend</span></p>
<p><strong>Start the Swarmops Backend server</strong></p>
<p>The site also needs a backend process, which can run on another machine. (If it does, like for security reasons, copy the file /etc/swarmops/database.config to that machine now.) To start the backend, run this now:</p>
<p><span style="font-family: Ubuntu Mono">systemctl start swarmops-backend</span></p>
</div>
<div id="DivReadyLogin" style="display:none">
<h2>All done - ready to login</h2>
<p>Your Swarmops installation is ready! Press Finish to log in as your new user and start using it.</p>
<div style="display:none"><asp:Button UseSubmitBehavior="false" runat="server" ID="ButtonLogin" OnClick="ButtonLogin_Click" Text="This button is invisible."/></div>
</div>
</div>
</div>
+29 -2
View File
@@ -12,7 +12,9 @@ using System.Web.Services;
using System.Web.SessionState;
using System.Web.UI;
using Resources;
using Swarmops.Common;
using Swarmops.Common.Enums;
using Swarmops.Common.ExtensionMethods;
using Swarmops.Database;
using Swarmops.Logic.Cache;
using Swarmops.Logic.Financial;
@@ -448,7 +450,6 @@ namespace Swarmops.Frontend.Pages.v5.Public
DatabaseMaintenance.UpgradeSchemata();
Thread.Sleep (100);
// SECURITY: With schemata to hold them in place, initialize the encryption keys
Authentication.InitializeSymmetricDatabaseKey();
@@ -457,9 +458,10 @@ namespace Swarmops.Frontend.Pages.v5.Public
// Set Geography at baseline (TODO: Ask for what baseline we got)
Persistence.Key["LastGeographyUpdateId"] = "0";
Persistence.Key["LastGeographyUpdate"] = "1900-01-01";
Persistence.Key["LastGeographyUpdate"] = Constants.DateTimeLow.ToString("yyyy-MM-dd");
// Set an installation ID
// Doubles as start signal to daemons (if installation ID exists, db is ready for processing)
Persistence.Key["SwarmopsInstallationId"] = Guid.NewGuid().ToString();
@@ -642,6 +644,31 @@ namespace Swarmops.Frontend.Pages.v5.Public
return false;
}
public class AjaxCallDaemonResult : AjaxCallResult
{
public bool Frontend { get; set; }
public bool Backend { get; set; }
}
[WebMethod]
public static AjaxCallDaemonResult GetDaemonStatus()
{
UInt64 unixNow = DateTime.UtcNow.ToUnix();
AjaxCallDaemonResult result = new AjaxCallDaemonResult();
if (SystemSettings.HeartbeatBackend + 60 > unixNow)
{
result.Backend = true; // backend heart is beating
}
if (SystemSettings.HeartbeatFrontend + 60 > unixNow)
{
result.Frontend = true; // frontend heart is beating
}
result.Success = true; // call as such succeeded
return result;
}
public static bool IsLocalhost()
{
string localAddress = HttpContext.Current.Request.ServerVariables["LOCAL_ADDR"];