lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

firmware: almost always avoid writing json file for updates

Browse Source 
This was leaking spurious json output sometimes, confusing
the firmware pages and its users.
This commit is contained in:
Franco Fichtner 2015-06-10 10:12:37 +02:00
parent ce0dc6d6d6
commit 422303626e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/opnsense/scripts/pkg_updatecheck.sh
View File

@ -61,7 +61,6 @@ timer=0
timeout=30 # Wait for a maximum number of seconds to determine connection issues
# File location variables
package_json_output="/tmp/pkg_status.json"
tmp_pkg_output_file="/tmp/packages.output"
tmp_pkg_update_file="/tmp/pkg_updates.output"
@ -233,12 +232,7 @@ if [ "$pkg_running" == "" ]; then
# Get date/timestamp
last_check=`date`
# Write our json structure to disk
echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"reinstall_packages\":[$packages_reinstall],\"upgrade_packages\":[$packages_upgraded],\"upgrade_needs_reboot\":\"$upgrade_needs_reboot\"}" > $package_json_output
echo "{\"connection\":\"$connection\",\"repository\":\"$repository\",\"last_check\":\"$last_check\",\"updates\":\"$updates\",\"core_version\":\"$core_version\",\"download_size\":\"$download_size\",\"extra_space_required\":\"$required_space\",\"new_packages\":[$packages_new],\"reinstall_packages\":[$packages_reinstall],\"upgrade_packages\":[$packages_upgraded],\"upgrade_needs_reboot\":\"$upgrade_needs_reboot\"}"
else
# pkg is already running, quitting
fi
# output json data
if [ -f $package_json_output ]; then
cat $package_json_output
fi

8
src/www/widgets/widgets/system_information.widget.php
View File

@ -35,13 +35,17 @@ require_once('notices.inc');
include_once("includes/functions.inc.php");
require_once("script/load_phalcon.php");
/* XXX keep redirect through file because we know it works, but zap this later */
$file_pkg_status = '/tmp/pkg_status.json';
if ($_POST['action'] == 'pkg_update') {
configd_run('firmware pkgstatus');
$pkg_json = trim(configd_run('firmware pkgstatus'));
if ($pkg_json != '') {
file_put_contents($file_pkg_status, $pkg_json);
}
}
if ($_REQUEST['getupdatestatus']) {
$file_pkg_status="/tmp/pkg_status.json";
if (file_exists($file_pkg_status)) {
$json = file_get_contents($file_pkg_status);
$pkg_status = json_decode($json, true);