From ef552bfb5ffca55b9225c580894356bfd0bb80e8 Mon Sep 17 00:00:00 2001 From: sukhbir-singh Date: Sat, 10 Aug 2019 03:06:03 +0530 Subject: [PATCH 1/2] fixed bug related to device formatting --- app/views/disk_wizard/done.html.slim | 16 ++++++++-------- lib/modules/operation.rb | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/disk_wizard/done.html.slim b/app/views/disk_wizard/done.html.slim index 3a1dbad..b2caa0e 100644 --- a/app/views/disk_wizard/done.html.slim +++ b/app/views/disk_wizard/done.html.slim @@ -82,7 +82,7 @@ css: br/ - else - @user_selections["format"] - .col-md-6.col-md-offset-3 + div table.table thead tr @@ -101,10 +101,10 @@ css: td | \/var/hda/disks/#{@user_selections['label']} - .col-md-12.well.well-sm - a.btn.btn-success href="/tab/disks/disk_wizards" + .col-md-12 + a.btn.btn-success.mb-2 href="/tab/disks/disk_wizard" | Continue with another device - button#get_debug_info.btn.btn-warning onclick="getDebugURL();" + button#get_debug_info.btn.btn-warning.ml-3.mb-2 onclick="getDebugURL();" | Get Debug infomation #fpaste_loading.col-md-8.col-md-offset-2 @@ -112,14 +112,14 @@ css: p.text-primary span.glyphicon.glyphicon-time | Please wait.Generating fpaste URL....... - #debug_info.col-md-10.col-md-offset-1 style=("display: none;") - .panel.panel-default - form.form-inline role="form" + #debug_info.col-md-10.d-inline-block.mt-2 style=("display: none;") + div.mt-2.panel.panel-default + form.ml-2.form-inline role="form" .form-group.has-success.has-feedback label.control-label for="fpaste_url" | URL: span.glyphicon.glyphicon-globe - input#fpaste_url.form-control autocomplete="off" data-placement="top" data-toggle="tooltip" onclick="$(this).select();" placeholder=("Generating URL..") style=("width: 500px;") title=("Press Ctrl+c to coppy URL to clipboard") type="text" / + input#fpaste_url.form-control autocomplete="off" data-placement="top" data-toggle="tooltip" onclick="$(this).select();" placeholder=("Generating URL..") style=("width: 375px;") title=("Press Ctrl+c to coppy URL to clipboard") type="text" / span.glyphicon.glyphicon-ok.form-control-feedback .panel-body.text-left p.text-primary diff --git a/lib/modules/operation.rb b/lib/modules/operation.rb index 7bed153..52bf780 100644 --- a/lib/modules/operation.rb +++ b/lib/modules/operation.rb @@ -62,7 +62,7 @@ def reload DiskUtils.probe_kernal end DebugLogger.info "|#{self.class.name}|>|#{__method__}|:Device Kname #{self.kname}" - node = DiskUtils.find dev_path + node = DiskUtils.all_devices dev_path if node['type'].eql? 'part' node.each do |key, value| instance_variable_set("@#{key}", value) unless value.nil? From 975b8cd3a10a03a996954c649cda06e0b064c15f Mon Sep 17 00:00:00 2001 From: sukhbir-singh Date: Sat, 10 Aug 2019 04:20:33 +0530 Subject: [PATCH 2/2] update debugging script for fpaste url --- app/views/disk_wizard/done.html.slim | 2 +- vendor/bash/debug_info.sh | 72 ++++++++++++++++------------ 2 files changed, 42 insertions(+), 32 deletions(-) diff --git a/app/views/disk_wizard/done.html.slim b/app/views/disk_wizard/done.html.slim index b2caa0e..2fee5ee 100644 --- a/app/views/disk_wizard/done.html.slim +++ b/app/views/disk_wizard/done.html.slim @@ -119,7 +119,7 @@ css: label.control-label for="fpaste_url" | URL: span.glyphicon.glyphicon-globe - input#fpaste_url.form-control autocomplete="off" data-placement="top" data-toggle="tooltip" onclick="$(this).select();" placeholder=("Generating URL..") style=("width: 375px;") title=("Press Ctrl+c to coppy URL to clipboard") type="text" / + input#fpaste_url.form-control autocomplete="off" data-placement="top" data-toggle="tooltip" onclick="$(this).select();" placeholder=("Generating URL..") style=("width: 375px; font-size:14px;") title=("Press Ctrl+C to copy URL to clipboard") type="text" / span.glyphicon.glyphicon-ok.form-control-feedback .panel-body.text-left p.text-primary diff --git a/vendor/bash/debug_info.sh b/vendor/bash/debug_info.sh index 89c4f52..e70c15b 100644 --- a/vendor/bash/debug_info.sh +++ b/vendor/bash/debug_info.sh @@ -1,36 +1,46 @@ #!/bin/bash echo "Disk-Wizard Debug information fetcher" -echo -e "\n------------This Debug Information was Generated on $(date +"%B-%d-%Y %r")------------\n" > /var/log/debug_info.tmp +output=/tmp/dw_debug_$$.tmp + +#exec > $output 2>&1 + +echo -e "\n------------This Debug Information was Generated on $(date +"%B-%d-%Y %r")------------\n" + +printf "\n/*===*dsw.log wrapper script log (tail -n 50)===*/\n" -printf "\n/*===*dsw.log wrapper script log (tail -n 50)===*/\n" >> /var/log/debug_info.tmp if [ ! -f /var/hda/apps/520ut3lo6w/elevated/dsw.log ]; then - echo "File not found!" >> /var/log/debug_info.tmp - else - tail -n 50 /var/hda/apps/520ut3lo6w/elevated/dsw.log >> /var/log/debug_info.tmp - fi - - printf "\n/*=== *Current mounted partitions ===*/\n" >> /var/log/debug_info.tmp - sudo mount -l >> /var/log/debug_info.tmp 2>&1 - - printf "\n/*=== *list disk/partitions details with parted ===*/\n" >> /var/log/debug_info.tmp - parted -sl print all >> /var/log/debug_info.tmp 2>&1 - - printf "\n/*=== *List all logical volumes ===*/\n" >> /var/log/debug_info.tmp - lvdisplay -av >> /var/log/debug_info.tmp 2>&1 - - printf "\n/*=== *dsk-wz.sh wrapper script ===*/\n" >> /var/log/debug_info.tmp - if [ ! -f /var/hda/apps/520ut3lo6w/elevated/dsk-wz.sh ]; then - echo "File not found!" >> /var/log/debug_info.tmp - else - cat /var/hda/apps/520ut3lo6w/elevated/dsk-wz.sh >> /var/log/debug_info.tmp - fi - - printf "\n/*=== *disk-wizard rails log file(tail -n 50)===*/\n" >> /var/log/debug_info.tmp - if [ ! -f /var/hda/platform/html/log/dw_debug.log ]; then - echo "File not found!" >> /var/log/debug_info.tmp - else - tail -n 50 /var/hda/platform/html/log/dw_debug.log >> /var/log/debug_info.tmp - fi - - fpaste -l bash /var/log/debug_info.tmp + echo "File not found!" +else + tail -n 50 /var/hda/apps/520ut3lo6w/elevated/dsw.log +fi + +printf "\n/*=== *Current mounted partitions ===*/\n" +sudo mount -l + +printf "\n/*=== *list disk/partitions details with parted ===*/\n" +parted -sl print all + +printf "\n/*=== *List all logical volumes ===*/\n" +lvdisplay -av + +printf "\n/*=== *dsk-wz.sh wrapper script ===*/\n" + +if [ ! -f /var/hda/apps/520ut3lo6w/elevated/dsk-wz.sh ]; then + echo "File not found!" +else + cat /var/hda/apps/520ut3lo6w/elevated/dsk-wz.sh +fi + +printf "\n/*=== *disk-wizard rails log file(tail -n 50)===*/\n" + +if [ ! -f /var/hda/platform/html/log/dw_debug.log ]; then + echo "File not found!" +else + tail -n 50 /var/hda/platform/html/log/dw_debug.log +fi + +#fpaste -l "shell" /var/log/debug_info.tmp + +tail -n 600 /var/hda/platform/html/log/dw_debug.log > temp_file && fpaste temp_file +