Skip to content

Commit

Permalink
Fixed problem with layout rendering due to initialize method not call…
Browse files Browse the repository at this point in the history
…ing super. Re-factored to use before_filter method to load @service_object and deleted initialize method.
  • Loading branch information
dpaterson committed Aug 2, 2012
1 parent ec90d44 commit 34d64a5
Showing 1 changed file with 37 additions and 33 deletions.
70 changes: 37 additions & 33 deletions crowbar_framework/app/controllers/logging_controller.rb
@@ -1,33 +1,37 @@
# Copyright 2012, Dell
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

class LoggingController < BarclampController
def initialize
@service_object = LoggingService.new logger
end

def export
ctime=Time.now.strftime("%Y%m%d-%H%M%S")
@file = "crowbar-logs-#{ctime}.tar.bz2"
pid = fork do
system("sudo -i /opt/dell/bin/gather_logs.sh #{@file}")
end
Process.detach(pid) # reap child process automatically; don't leave running
redirect_to "/utils?waiting=true&file=#{@file.gsub(/\./,'-DOT-')}"
end


end

# Copyright 2012, Dell
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

class LoggingController < BarclampController
before_filter :set_service_object

def set_service_object
@service_object = LoggingService.new logger
end

private :set_service_object

def export
ctime=Time.now.strftime("%Y%m%d-%H%M%S")
@file = "crowbar-logs-#{ctime}.tar.bz2"
pid = fork do
system("sudo -i /opt/dell/bin/gather_logs.sh #{@file}")
end
Process.detach(pid) # reap child process automatically; don't leave running
redirect_to "/utils?waiting=true&file=#{@file.gsub(/\./,'-DOT-')}"
end


end

0 comments on commit 34d64a5

Please sign in to comment.