mlserver 1.0.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 565870637b0850519fc89c56d3aa2dbf8a400d26577440d81b1db195ce4eae78
-  data.tar.gz: 8632c4624dcd90c02a76ba2437a92ca74d3fa4d93c709f3e75b0332f0f5b668b
+  metadata.gz: 22e124eded055286605b8d9ba7a590695492e2c2b939248789c21e756ecccb29
+  data.tar.gz: 5ed4807343ab09b99b54c4744474378c84aed218722d009b58661fcc21a6dd54
 SHA512:
-  metadata.gz: beb25988af8aeda7895d8fbc794c1cf9f4c3d6b9efc32ad9886bf09534eff26c525d0d2a5108d34d0d265029524d3c9a4615fc1d36df7ad2420dc0e450ea9d89
-  data.tar.gz: a07ce050c8f7efd559218c5ed1ca9f852aa582cb0186ff35f7ac644e3dedc0849fda84d0cabbf4dbff9bf6a4b4d035f257b7a509eee7e7128b4fa35eac4f3e54
+  metadata.gz: eca4cf68f62a8657eb51707be102851effe47eec6f83ef36512a8e97de4adc7fccdd7d117aee58a0d6d505c8ba480eec5c97833a148a97465cf710648f6c3315
+  data.tar.gz: e078bf1f0e085ea495fff726df178715c038170e3a516e95a42c371ef4d036791dd48a5ce7811224c5fcdc5565672fee40edb28b2c77d8774faaf376b02e2ec4

data/bin/mlserver

@@ -11,6 +11,28 @@ s = {}
 x = ArgsParser::Args.new(options: o, switches: s)
 
 conf_file = x.data[0]
-require_relative conf_file
 
-MLserver::Server.start()
+if !conf_file
+  conf_file = "mlserver.conf.rb"
+end
+
+if File.directory?(conf_file)
+  conf_file = "#{conf_file}/mlserver.conf.rb"
+end
+
+if !File.exist?(conf_file)
+  STDERR.puts "Error: Conf file does not exist"
+  exit 1
+end
+
+full_conf_file_path = File.expand_path(conf_file, Dir.pwd)
+
+Dir.chdir(File.dirname full_conf_file_path)
+
+require full_conf_file_path
+
+begin
+  MLserver::Server.start()
+rescue Interrupt
+  MLserver.settings.logger.log("\nReceived Interrupt, Exiting...", :error)
+end

data/lib/MLserver/logger.rb

@@ -1,12 +1,13 @@
 module MLserver
   class Logger
-    @@log_levels = [:info, :warn, :error]
+    @@log_levels = [:info, :warn, :error, :traffic_in, :traffic_out]
 
-    def initialize(out:, err:, log_colors: {}, outputs: {error: :err})
+    def initialize(out:, err:, log_colors: {}, outputs: {error: :err}, levels_with_timestamp: [:traffic_in, :traffic_out])
       @out = out
       @err = err
       @log_colors = log_colors
       @outputs = outputs
+      @levels_with_timestamp = levels_with_timestamp
     end
 
     def log(message, level = :info)
@@ -16,6 +17,9 @@ module MLserver
       if @log_colors[level]
         message = message.color @log_colors[level]
       end
+
+      message = "#{Time.now} | #{message}" if @levels_with_timestamp.include?(level)
+
       out.puts message
     end
 
@@ -38,13 +42,15 @@ module MLserver
     def log_traffic(ip, direction, data)
       symbol = (direction == :incoming ? "=>" : "<=")
 
-      log("#{format_ip_address ip} #{symbol} #{data}")
+      log("#{format_ip_address ip} #{symbol} #{data}", (direction == :incoming ? :traffic_in : :traffic_out))
     end
   end
 
   dlcolors = {
     warn: :yellow,
-    error: :red
+    error: :red,
+    traffic_in: :green,
+    traffic_out: :blue
   }
 
   DefaultLogger = Logger.new(out: STDOUT, err: STDERR, log_colors: dlcolors)

data/lib/MLserver/server.rb

@@ -103,6 +103,12 @@ module MLserver
           end
         end
 
+        if MLserver.settings.trim_urls && r.path != "/" && r.path[-1] == "/"
+          r.respond RedirectResponse.new(r.path[0..-2], type: 301, httpver: "HTTP/1.0").response
+          client.close
+          Thread.exit
+        end
+
         begin
           handler.run(r, client)
         rescue => e

data/lib/MLserver/settings.rb

@@ -14,9 +14,11 @@ module MLserver
       @ssl_additional_certs = []
       @ssl_host = nil
       @ssl_port  = nil
+      @trim_urls = false
     end
 
-    attr_accessor :host, :port, :handler, :logger, :force_host, :ssl, :ssl_key, :ssl_cert, :ssl_additional_certs, :ssl_host, :ssl_port
+    attr_accessor :host, :port, :handler, :logger, :force_host, :ssl, :ssl_key, :ssl_cert, :ssl_additional_certs, :ssl_host, :ssl_port,
+                  :trim_urls
   end
 
   def self.settings

data/lib/MLserver.rb

@@ -1,6 +1,6 @@
 module MLserver
   def self.version
-    "1.0.1"
+    "1.0.3"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mlserver
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Matthias Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: argparse