rearrange a bit

source/stratos/app.d

@@ -2,7 +2,7 @@ module stratos.app;
 
 import std.stdio;
 import stratos.api.internal.Raft;
-import stratos.raft;
+import stratos.cluster.raft;
 //import stratos.upnp;
 import vibe.d;
 import vibethrift.server;

source/stratos/cluster/consensus.d

@@ -0,0 +1 @@
+module stratos.cluster.consensus;

source/stratos/raft.d → source/stratos/cluster/raft.d

@@ -1,4 +1,4 @@
-module stratos.raft;
+module stratos.cluster.raft;
 
 import d2sqlite3;
 

source/stratos/upnp.d → source/stratos/cluster/upnp.d

@@ -1,4 +1,4 @@
-module stratos.upnp;
+module stratos.cluster.upnp;
 
 import vibe.core.log;
 
@@ -110,19 +110,14 @@ class UPnP
         import std.socket : Socket;
         import std.string : replace;
         import std.uuid : randomUUID;
-        import stratos.osinfo;
+        import stratos.util.osinfo;
+        import stratos.versionid;
 
         if (myIPs.length == 0) return;
 
         auto name = Socket.hostName;
         auto configID = 1;
         auto msgNumber = 1;
-        // So, this is an interesting problem.
-        // How do we detect the OS version? And what part of the OS?
-        // For instance, you might have code that should only run on Linux with kernel 2.6 or higher.
-        // We want the kernel name. Or maybe the GLIBC version is the issue. Or maybe you want it
-        // to run on Ubuntu 16.04 or higher, or SLES 11.x, or something like that.
-        enum stratosVersion = "0.0.1";
         auto os = osInfo;
 
         auto packet = mixin(interp!`NOTIFY * HTTP/1.1
@@ -165,7 +160,7 @@ private void readHeader(ref UPnP.SSDPService service, string line)
     import std.array : array;
     import std.conv : to;
     import std.string : strip;
-    import stratos.util : splitOnce;
+    import stratos.util.util : splitOnce;
 
     auto tag = line.splitter(":").front;
     auto value = line[tag.length + 1 .. $].strip;

source/stratos/consensus.d

@@ -1 +0,0 @@
-module stratos.consensus;

source/stratos/job.d

@@ -1,134 +0,0 @@
-module stratos.job;
-
-import core.time, std.datetime;
-
-/// The definition of a job.
-class JobDef
-{
-    /// The friendly name of the job.
-    string name;
-
-    /**
-     * The version number for this job.
-     *
-     * Multiple jobs with the same name are considered versions of the same job.
-     * The newest job wins, replacing previous ones.
-     */
-    size_t versionNumber;
-
-    /// Which ports it needs to run on. We'll use network trickery to make sure it always works.
-    ushort[] ports;
-    
-    /// How often to run it, how many instances, etc.
-    Schedule schedule;
-    
-    /// How to determine if it's healthy.
-    HealthCheck healthcheck;
-
-    /**
-     * How long it takes to drain instances of this service.
-     *
-     * When you gracefully terminate a task, its DNS records are removed. Once the DNS cache gets flushed, we
-     * wait this long for the last requests to be finished before stopping the task.
-     *
-     * When you restart a task, update a job, etc, we bring up the new task first, wait for it to become healthy,
-     * then undertake the process described.
-     */
-    Duration drainTime = 30.seconds;
-}
-
-/**
- * How and when to run a job.
- * This is a little combinatorial, but some options:
- *
- * {instances=1, restart=always, period=0}
- *   Run this continually, but only once instance.
- *
- * {instances=2, restart=never, period=0}
- *   Run this right now, two copies; don't restart. One-off job.
- *
- * {instances=1, restart=never, period=8h}
- *   Start this every eight hours; don't restart.
- *
- * {instances=1, restart=onerror, period=1h}
- *   Start this every hour. If it fails early with an error, rerun it.
- *   This will not run the job multiple overlapping times.
- */
-class Schedule
-{
-    /// How to handle restarts.
-    enum Restart
-    {
-        /// Restart this thing if it exits, cleanly or otherwise.
-        Always,
-        /// Don't restart this thing, no matter why it fails.
-        Never,
-        /// Restart this thing if it fails, not if it exits cleanly.
-        OnError,
-    }
-
-    /// How many instances should be run at once.
-    size_t instances = 1;
-    /// Whether to restart if a task ends.
-    Restart restart = Restart.Always;
-    /// How frequently to run this task.
-    Duration period = Duration.zero;
-}
-
-struct JobID
-{
-    string name;
-    size_t revision;
-}
-
-/// A Task is a process run for a job.
-class Task
-{
-    /// The corresponding job.
-    JobDef job;
-    /// When this started running.
-    SysTime start;
-    /// When this stopped running. SysTime.min if it's still ongoing.
-    SysTime end;
-    /// If this process has exited, this is its exit code.
-    int exitCode;
-    /// The name of the instance that is running / ran this job.
-    string runningInstance;
-    /// The path at which ith sshould have run.
-    string logPath;
-}
-
-/// A HealthCheck is how we determine service health.
-class HealthCheck
-{
-    /// What type of healthcheck to perform.
-    enum Type
-    {
-        /// Perform an HTTP(S) GET request, using the status code to determine health.
-        HTTP,
-        /// Connect to a socket. Successful connection means healthy.
-        Socket
-    }
-
-    /// This healthcheck's type.
-    Type type;
-    /// If HTTP, request the given path.
-    string httpPath = "/";
-    /// Whether to make an SSL request.
-    bool ssl = false;
-    /// What port to request. If not specified, HTTPS gets port 443, HTTP gets port 80.
-    // TODO is this necessary? Jobs will specify which ports they get.
-    ushort port = 0;
-
-    /// How frequently to check job health.
-    Duration interval = seconds(30);
-    /// Services might take extra time to warm up. This is how much extra time to give.
-    Duration startupGracePeriod = seconds(60);
-
-    /// How many checks in a row to succeed before calling this healthy.
-    ushort healthyCount = 2;
-    /// How many checks in a row to fail before calling this unhealthy (and then we'll stop routing traffic).
-    ushort unhealthyCount = 1;
-    /// How many checks in a row to fail before calling this unhealthy (and then we'll restart the task).
-    ushort respawnCount = 5;
-}

source/stratos/osinfo.d → source/stratos/util/osinfo.d

@@ -1,4 +1,4 @@
-module stratos.osinfo;
+module stratos.util.osinfo;
 
 struct OS
 {

source/stratos/serialize.d → source/stratos/util/serialize.d

@@ -1,4 +1,4 @@
-module stratos.serialize;
+module stratos.util.serialize;
 
 import core.time;
 import datetimeformat;

source/stratos/util.d → source/stratos/util/util.d

@@ -1,4 +1,4 @@
-module stratos.util;
+module stratos.util.util;
 
 import std.range.primitives : isInputRange, ElementType;