Skip to content

fix(leviton): add SUCCESS to body of responses #445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
camreeves merged 1 commit into from
May 8, 2023
Merged

fix(leviton): add SUCCESS to body of responses #445

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions drivers/leviton/acquisuite.cr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class Leviton::Acquisuite < PlaceOS::Driver
case form_data["MODE"]
# This is the server checking the status of our webhook so just 200 back
when "STATUS"
return {HTTP::Status::OK.to_i, {} of String => String, ""}
return {HTTP::Status::OK.to_i, {} of String => String, "SUCCESS"}
# This is the server asking for a list of devices which we need the config files
when "CONFIGFILEMANIFEST"
return {HTTP::Status::OK.to_i, {} of String => String, device_to_manifest.join("\n")}
Expand All @@ -63,14 +63,14 @@ class Leviton::Acquisuite < PlaceOS::Driver
files = files.not_nil!
return log_file_upload(files, form_data)
else
{HTTP::Status::INTERNAL_SERVER_ERROR.to_i, {"Content-Type" => "application/json"}, "Invalid mode passed. Either STATUS, CONFIGFILEMANIFEST, CONFIGFILEUPLOAD or LOGFILEUPLOAD required. Got #{form_data["MODE"]}"}
{HTTP::Status::INTERNAL_SERVER_ERROR.to_i, {"Content-Type" => "application/json"}, "FAILURE: Invalid mode passed. Either STATUS, CONFIGFILEMANIFEST, CONFIGFILEUPLOAD or LOGFILEUPLOAD required. Got #{form_data["MODE"]}"}
end
end
rescue error
logger.warn(exception: error) { "processing webhook request: #{body.inspect}" }
self[:last_error] = error.inspect_with_backtrace
self[:error_payload] = body
{HTTP::Status::INTERNAL_SERVER_ERROR.to_i, {"Content-Type" => "application/json"}, error.message.to_s}
{HTTP::Status::INTERNAL_SERVER_ERROR.to_i, {"Content-Type" => "application/json"}, "FAILURE: #{error.message.to_s}"}
end

protected def log_file_upload(files : Hash(String, Array(ActionController::BodyParser::FileUpload)), form_data : URI::Params)
Expand All @@ -81,7 +81,7 @@ class Leviton::Acquisuite < PlaceOS::Driver
# Add this device to our device list
@device_list["mb-%03d.ini" % modbus_index] = {"X", "0000-00-00 00:00:00"}
define_setting(:device_list, @device_list)
return {HTTP::Status::NOT_ACCEPTABLE.to_i, {} of String => String, ""}
return {HTTP::Status::NOT_ACCEPTABLE.to_i, {} of String => String, "FAILURE: Device list invalid"}
end
return if log_contents.nil?
csv = CSV.new(log_contents, headers: true)
Expand Down Expand Up @@ -114,7 +114,7 @@ class Leviton::Acquisuite < PlaceOS::Driver
measurement: "acquisuite",
}
end
{HTTP::Status::OK.to_i, {} of String => String, ""}
{HTTP::Status::OK.to_i, {} of String => String, "SUCCESS"}
end

protected def config_file_upload(files : Hash(String, Array(ActionController::BodyParser::FileUpload)), form_data : URI::Params)
Expand All @@ -130,7 +130,7 @@ class Leviton::Acquisuite < PlaceOS::Driver

# Now update our config list with the new config
store_config(form_data["MODBUSDEVICE"], config_contents) unless config_contents.nil?
{HTTP::Status::OK.to_i, {} of String => String, ""}
{HTTP::Status::OK.to_i, {} of String => String, "SUCCESS"}
end

protected def get_file(files : Hash(String, Array(ActionController::BodyParser::FileUpload)), name : String)
Expand Down