fluentd-server 0.1.0 → 0.2.0

data/lib/fluentd_server/web.rb

@@ -5,7 +5,7 @@ require 'slim'
 
 require 'fluentd_server'
 require 'fluentd_server/config'
-require 'fluentd_server/environments'
+require 'fluentd_server/environment'
 require 'fluentd_server/model'
 require 'fluentd_server/decorator'
 require 'fluentd_server/logger'
@@ -24,18 +24,12 @@ class FluentdServer::Web < Sinatra::Base
   helpers Sinatra::RedirectWithFlash
   register Sinatra::ActiveRecordExtension
 
-  # get ALL posts
-  get "/" do
-    @posts = Post.order("name ASC")
-    slim :"posts/index"
-  end
-
   # create new post
-  get "/posts/create" do
-    @tab = 'create'
-    @title = 'Create'
+  get %r{^/$|^/posts/create$} do
+    @tab = 'posts'
+    @posts = Post.order("name ASC")
     @post = Post.new
-    slim :"posts/create"
+    slim :"posts/layout"
   end
 
   post "/posts" do
@@ -49,15 +43,16 @@ class FluentdServer::Web < Sinatra::Base
 
   # edit post
   get "/posts/:id/edit" do
-    @title = 'Edit'
-    @post = Post.find(params[:id])
-    return 404 unless @post
-    slim :"posts/edit"
+    @tab = 'posts'
+    @post = Post.find_by(id: params[:id])
+    redirect "/" unless @post
+    @posts = Post.order("name ASC")
+    slim :"posts/layout"
   end
 
   post "/posts/:id" do
-    @post = Post.find(params[:id])
-    return 404 unless @post
+    @post = Post.find_by(id: params[:id])
+    redirect "/" unless @post
     if @post.update(params[:post])
       redirect "/posts/#{@post.id}/edit", :notice => @post.decorate.success_message
     else
@@ -66,12 +61,12 @@ class FluentdServer::Web < Sinatra::Base
   end
 
   # delete post
-  get "/posts/:name/delete" do
-    @post = Post.find_by(name: params[:name])
+  post "/posts/:id/delete" do
+    @post = Post.find_by(id: params[:id])
     if @post.destroy
-      redirect "/", :notice => @post.decorate.success_message
+      redirect "/posts/create", :notice => @post.decorate.success_message
     else
-      redirect "/", :error => @post.decorate.error_message
+      redirect "/posts/create", :error => @post.decorate.error_message
     end
   end
 
@@ -98,4 +93,56 @@ class FluentdServer::Web < Sinatra::Base
     content_type :text
     @post.decorate.render_body(query_params)
   end
+
+  # list tasks
+  get "/tasks" do
+    @tab = 'tasks'
+    @tasks = Task.limit(20).order("id DESC")
+    slim :"tasks/show"
+  end
+
+  # show task
+  get "/tasks/:id" do
+    @tab = 'tasks'
+    @tasks = Task.limit(20).order("id DESC")
+    @task = Task.find_by(id: params[:id])
+    slim :"tasks/show"
+  end
+
+  # get task body in json for ajax
+  get "/json/tasks/:id/body" do
+    content_type :json
+    offset = params[:offset].to_i
+    task = Task.find_by(id: params[:id])
+    body = task.body(offset).to_s
+    bytes = body.bytesize
+    more_data = !task.finished? || bytes > offset
+    {
+      body: body,
+      bytes: bytes,
+      moreData: more_data,
+    }.to_json.tap {|json| logger.debug json }
+  end
+
+  # restart task
+  post "/task/restart" do
+    @task = ::Task.create_and_delete(name: 'Restart')
+    @task.restart
+    redirect "/tasks/#{@task.id}"
+  end
+
+  # status task
+  post "/task/status" do
+    @task = ::Task.create_and_delete(name: 'Status')
+    @task.status
+    redirect "/tasks/#{@task.id}"
+  end
+
+  # configtest task
+  post "/task/configtest" do
+    @task = ::Task.create_and_delete(name: 'Configtest')
+    @task.configtest
+    redirect "/tasks/#{@task.id}"
+  end
+
 end

data/lib/fluentd_server/web_helper.rb

@@ -73,19 +73,23 @@ module FluentdServer::WebHelper
     CGI.escape(str)
   end
 
-  def title
-    @title || 'Welcome'
+  def active_if(cond)
+    'active' if cond
   end
 
-  def tab
-    @tab || 'welcome'
+  def disabled_if(cond)
+    'disabled="disabled"' if cond
   end
 
-  def active(_tab)
-    if tab == _tab
-      'active'
-    else
-      ''
-    end
+  def bootstrap_flash
+    slim <<-EOF
+- if flash[:notice]
+  p.alert.alert-success
+    == flash[:notice]
+- if flash[:error]
+  p.alert.alert-danger
+    == flash[:error]
+EOF
   end
+
 end