mkit 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 567f1ce28fb7c14d9eb23ddd36c4f98f68516b1c967450ec11188bfc460f5fdb
-  data.tar.gz: 389a9060968047e9efb35ba47cdf3492d4ed47d8f92ce5e82203bb0668dd5ec1
+  metadata.gz: 5c7293226251f8d031a6b864f4ef7e9932a6046be6a7e78e07e203b1d9e4ff9a
+  data.tar.gz: 8a4993da20b730eb02f3f0605e257d255348861f84c3b8412e7b46b94316886c
 SHA512:
-  metadata.gz: c86fc61f402f4559bbda5eb4bb89fa1a11073e0ad228f954a0cee370c50d3d3367469f64acf6073bb702985dcb99a9c655c4b38cc95f9a010e8623102742a2cd
-  data.tar.gz: 9387d17b7394fa1619ad0ca7b03cda17ff4b98d1de7a56624a60fe96382a95b2501a11c07f41cbe36b7f3a2d569253903b2288aebb71430ed6d671ceebd17464
+  metadata.gz: bdd7a977df1915b70778fb7626836d0718563efc523cd128c2ee797ace0da1cb4c0f20e6b9dc2667bc1cfb03ec8efd0447b891a3a62179af68c01e6418c1d2de
+  data.tar.gz: e2783cd197695782478e29c075343a2bd6a1d5b84f5fe9d97ac7701a9329b1d26f874ab50a4493f85c629cbf2f3f2cf2761223700806d7c7adc322138e0d6cdc

data/lib/mkit/app/controllers/services_controller.rb

@@ -43,12 +43,14 @@ class ServicesController < MKIt::Server
       srv.log
     else
       pod = find_srv_pod_by_id_or_name(srv)
-      options_parameter = build_options_hash(params: params, options: [:nr_lines, :pods, :follow])
+      options_parameter = build_options_hash(params: params, options: [
+        :nr_lines, :pods, :follow, :details, :timestamps, :clear
+      ])
       request.websocket do |ws|
         listener = nil
         ws.onopen do
           settings.sockets << ws
-          ws.send("<<<< %s | %s >>>>\n" % [srv.name, srv.pod.first.name])
+          ws.send("<<<< %s | %s >>>>\n" % [srv.name, pod.name])
           listener = MKIt::DockerLogListener.new(pod, ws, options: options_parameter)
           settings.listeners << listener
           listener.register

data/lib/mkit/app/helpers/docker_helper.rb

@@ -38,6 +38,14 @@ module MKIt
       `docker logs -n 20 #{instance_id}`
     end
 
+    def logfile(instance_id)
+      `docker inspect --format='{{.LogPath}}' #{instance_id}`
+    end
+
+    def clear_logs(instance_id)
+      `echo > #{logfile(instance_id)}`
+    end
+
     #
     # network
     #

data/lib/mkit/app/helpers/services_helper.rb

@@ -26,10 +26,10 @@ module MKIt
     def find_srv_pod_by_id_or_name(srv)
       if params[:pod_id]
         pod = srv.find_pod_by_id_or_name(params[:pod_id])
-        error 404, "Service pod not found." unless pod
       else
         pod = srv.pod.first
       end
+      error 404, "Service pod not found." unless pod
       pod
     end
 

data/lib/mkit/app/model/service.rb

@@ -271,7 +271,7 @@ class Service < ActiveRecord::Base
     end
     srv['ports'] = []
     self.service_port.each { |p|
-      "#{p.internal_port}:#{p.external_port}:#{p.mode}:#{p.load_bal}".tap { |x|
+      "#{p.external_port}:#{p.internal_port}:#{p.mode}:#{p.load_bal}".tap { |x|
         if p.ssl == 'true'
           x << ':ssl'
           if !p.crt.nil? && p.crt != MKIt::Utils.proxy_cert

data/lib/mkit/client/commands.yaml

@@ -245,6 +245,25 @@
       type: option
       switch:
         - "-n"
+    - name: timestamps
+      help:
+        - -t
+        - Show timestamps
+      mandatory: false
+      param: "<%=true%>"
+      type: flag
+      switch:
+        - "-t"
+        - "--timestamps"
+    - name: details
+      help:
+        - -d
+        - Show extra details
+      mandatory: false
+      param: "<%=true%>"
+      type: flag
+      switch:
+        - "-d"
 - cmd: version
   help: prints mkit client and server version
   request:

data/lib/mkit/pods/docker_log_listener.rb

@@ -1,15 +1,25 @@
 require "mkit/cmd/shell_client"
+require "mkit/app/helpers/docker_helper"
 
 module MKIt
   class DockerLogListener < MKIt::ShellClient
 
+    include DockerHelper
+
     def initialize(pod, ws, options: {})
+      if options[:clear]
+        clear_logs(pod.name)
+      end
       @pod = pod
       @ws = ws
       command = "docker logs"
       command += " -f" if options[:follow] == 'true'
       command += " -n #{options[:nr_lines]}" if options[:nr_lines]
       command += " -n 10" unless options[:nr_lines]
+      command += " -t" if options[:timestamps] == 'true'
+      command += " --since #{options[:since]}" if options[:since]
+      command += " --until #{options[:until]}" if options[:until]
+      command += " --details" if options[:details] == 'true'
       command += " #{@pod.name}"
       super(command: command)
     end

data/lib/mkit/version.rb

@@ -1,4 +1,4 @@
 module MKIt
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mkit
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Vasco Santos
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-26 00:00:00.000000000 Z
+date: 2025-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async-dns
@@ -457,7 +457,7 @@ homepage: https://github.com/valexsantos/mkit
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -472,8 +472,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.5
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: Micro Kubernets on Ruby
 test_files: []