diff --git a/def/taskUtils.go b/def/taskUtils.go index 0d203eb..1822779 100644 --- a/def/taskUtils.go +++ b/def/taskUtils.go @@ -26,8 +26,8 @@ import ( "github.com/mash/gokmeans" "github.com/montanaflynn/stats" log "github.com/sirupsen/logrus" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" ) // Information about a cluster of tasks. diff --git a/elektronLogging/ElektronFormatter.go b/logging/ElektronFormatter.go similarity index 96% rename from elektronLogging/ElektronFormatter.go rename to logging/ElektronFormatter.go index a0b1ff0..1ea7ea0 100644 --- a/elektronLogging/ElektronFormatter.go +++ b/logging/ElektronFormatter.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "bytes" diff --git a/elektronLogging/clsfnTaskDistOverheadLogger.go b/logging/clsfnTaskDistOverheadLogger.go similarity index 98% rename from elektronLogging/clsfnTaskDistOverheadLogger.go rename to logging/clsfnTaskDistOverheadLogger.go index bd13429..b965609 100644 --- a/elektronLogging/clsfnTaskDistOverheadLogger.go +++ b/logging/clsfnTaskDistOverheadLogger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" diff --git a/elektronLogging/consoleLogger.go b/logging/consoleLogger.go similarity index 98% rename from elektronLogging/consoleLogger.go rename to logging/consoleLogger.go index 052fc30..d1a115d 100644 --- a/elektronLogging/consoleLogger.go +++ b/logging/consoleLogger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "fmt" diff --git a/elektronLogging/createLogDir.go b/logging/createLogDir.go similarity index 97% rename from elektronLogging/createLogDir.go rename to logging/createLogDir.go index b5666d9..e6730f4 100644 --- a/elektronLogging/createLogDir.go +++ b/logging/createLogDir.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" diff --git a/elektronLogging/logger.go b/logging/logger.go similarity index 95% rename from elektronLogging/logger.go rename to logging/logger.go index 90c2b87..b271c44 100644 --- a/elektronLogging/logger.go +++ b/logging/logger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" @@ -6,7 +6,7 @@ import ( "time" log "github.com/sirupsen/logrus" - . "github.com/spdfg/elektron/elektronLogging/types" + . "github.com/spdfg/elektron/logging/types" ) var config LoggerConfig diff --git a/elektronLogging/loggerChain.go b/logging/loggerChain.go similarity index 98% rename from elektronLogging/loggerChain.go rename to logging/loggerChain.go index a771257..ff9792e 100644 --- a/elektronLogging/loggerChain.go +++ b/logging/loggerChain.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( log "github.com/sirupsen/logrus" diff --git a/elektronLogging/loggerConfig.go b/logging/loggerConfig.go similarity index 98% rename from elektronLogging/loggerConfig.go rename to logging/loggerConfig.go index 06ac247..a0ae5de 100644 --- a/elektronLogging/loggerConfig.go +++ b/logging/loggerConfig.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( log "github.com/sirupsen/logrus" diff --git a/elektronLogging/pcpLogger.go b/logging/pcpLogger.go similarity index 98% rename from elektronLogging/pcpLogger.go rename to logging/pcpLogger.go index 7dc8fd1..d9a91f8 100644 --- a/elektronLogging/pcpLogger.go +++ b/logging/pcpLogger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" diff --git a/elektronLogging/schedPolicySwitchLogger.go b/logging/schedPolicySwitchLogger.go similarity index 98% rename from elektronLogging/schedPolicySwitchLogger.go rename to logging/schedPolicySwitchLogger.go index c3d555b..437c300 100644 --- a/elektronLogging/schedPolicySwitchLogger.go +++ b/logging/schedPolicySwitchLogger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" diff --git a/elektronLogging/schedTraceLogger.go b/logging/schedTraceLogger.go similarity index 98% rename from elektronLogging/schedTraceLogger.go rename to logging/schedTraceLogger.go index 9174e80..ccbad63 100644 --- a/elektronLogging/schedTraceLogger.go +++ b/logging/schedTraceLogger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" diff --git a/elektronLogging/schedWindowLogger.go b/logging/schedWindowLogger.go similarity index 98% rename from elektronLogging/schedWindowLogger.go rename to logging/schedWindowLogger.go index 75c6a50..b303b28 100644 --- a/elektronLogging/schedWindowLogger.go +++ b/logging/schedWindowLogger.go @@ -1,4 +1,4 @@ -package elektronLogging +package logging import ( "os" diff --git a/elektronLogging/types/types.go b/logging/types/types.go similarity index 100% rename from elektronLogging/types/types.go rename to logging/types/types.go diff --git a/pcp/pcp.go b/pcp/pcp.go index 90d0b52..5f5affd 100644 --- a/pcp/pcp.go +++ b/pcp/pcp.go @@ -25,8 +25,8 @@ import ( "time" log "github.com/sirupsen/logrus" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" ) func Start(quit chan struct{}, logging *bool, pcpConfigFile string) { diff --git a/powerCap/extrema.go b/powerCap/extrema.go index dbd38aa..e2d2bec 100644 --- a/powerCap/extrema.go +++ b/powerCap/extrema.go @@ -30,8 +30,8 @@ import ( "time" log "github.com/sirupsen/logrus" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" "github.com/spdfg/elektron/pcp" "github.com/spdfg/elektron/rapl" ) diff --git a/powerCap/progressiveExtrema.go b/powerCap/progressiveExtrema.go index f75f849..2ab9147 100644 --- a/powerCap/progressiveExtrema.go +++ b/powerCap/progressiveExtrema.go @@ -32,8 +32,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/constants" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" "github.com/spdfg/elektron/pcp" "github.com/spdfg/elektron/rapl" "github.com/spdfg/elektron/utilities" diff --git a/scheduler.go b/scheduler.go index ec2df7b..d376f38 100644 --- a/scheduler.go +++ b/scheduler.go @@ -31,8 +31,8 @@ import ( sched "github.com/mesos/mesos-go/api/v0/scheduler" log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/def" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" "github.com/spdfg/elektron/pcp" "github.com/spdfg/elektron/powerCap" "github.com/spdfg/elektron/schedulers" diff --git a/schedulers/base.go b/schedulers/base.go index 25f06a9..55657c3 100644 --- a/schedulers/base.go +++ b/schedulers/base.go @@ -30,8 +30,8 @@ import ( sched "github.com/mesos/mesos-go/api/v0/scheduler" log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/def" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" "github.com/spdfg/elektron/utilities" "github.com/spdfg/elektron/utilities/schedUtils" ) diff --git a/schedulers/helpers.go b/schedulers/helpers.go index a9004e0..fcc3f05 100644 --- a/schedulers/helpers.go +++ b/schedulers/helpers.go @@ -27,8 +27,8 @@ import ( log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/constants" "github.com/spdfg/elektron/def" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" "github.com/spdfg/elektron/utilities" "github.com/spdfg/elektron/utilities/mesosUtils" ) diff --git a/schedulers/schedPolicy.go b/schedulers/schedPolicy.go index dfd44ec..cc6ae14 100644 --- a/schedulers/schedPolicy.go +++ b/schedulers/schedPolicy.go @@ -26,8 +26,8 @@ import ( sched "github.com/mesos/mesos-go/api/v0/scheduler" log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/def" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" ) type SchedPolicyContext interface { diff --git a/utilities/offerUtils/offerUtils.go b/utilities/offerUtils/offerUtils.go index 4c1a475..0f9338e 100644 --- a/utilities/offerUtils/offerUtils.go +++ b/utilities/offerUtils/offerUtils.go @@ -24,8 +24,8 @@ import ( mesos "github.com/mesos/mesos-go/api/v0/mesosproto" log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/constants" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" ) func OfferAgg(offer *mesos.Offer) (float64, float64, float64) { diff --git a/utilities/schedUtils/schedUtils.go b/utilities/schedUtils/schedUtils.go index 5e4fc69..c28c201 100644 --- a/utilities/schedUtils/schedUtils.go +++ b/utilities/schedUtils/schedUtils.go @@ -21,8 +21,8 @@ package schedUtils import ( log "github.com/sirupsen/logrus" "github.com/spdfg/elektron/def" - elekLog "github.com/spdfg/elektron/elektronLogging" - elekLogTypes "github.com/spdfg/elektron/elektronLogging/types" + elekLog "github.com/spdfg/elektron/logging" + elekLogTypes "github.com/spdfg/elektron/logging/types" "github.com/spdfg/elektron/utilities" )