refactor: datacollector #2240
Open
refactor: datacollector #2240
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
PiTrem
force-pushed
the
fix_data_collector
branch
2 times, most recently
from
e592e1d
to
96a198f
Compare
Module Datacollector
separate business logic
* collector.rb: file/folder crawler for a given device
* correspondence.rb: set the sender and recipient
encompass AR Model logic to create the attachments into the proper
containers
* configuration.rb: validate the datacollector device config
also instantiate the SFTP client if applicable
* collector_file: file/folder class for basic file operations
independent of whether the file is on local fs or over sftp
AdminApi device connection testing:
* now rely on Datacollector::Configuration
PiTrem
force-pushed
the
fix_data_collector
branch
from
96a198f
to
39d59e0
Compare
| ext { 'chemotion' } | ||
| name { File.basename(Faker::File.file_name(ext: ext)) } | ||
| root { nil } | ||
| touch { true } |
There was a problem hiding this comment.
Rails/SkipsModelValidations: Avoid using touch because it skips validations.
| initialize_with do | ||
| pathname = Pathname.new(prefix ? "#{prefix}-#{name}" : name) | ||
| pathname = root.join(pathname) if root | ||
| FileUtils.touch(pathname) if touch |
There was a problem hiding this comment.
Rails/SkipsModelValidations: Avoid using touch because it skips validations.
| pathname = root.join(pathname) if root | ||
| FileUtils.touch(pathname) if touch | ||
| FileUtils.cp(copy_from, pathname) if copy_from | ||
| pathname.chmod(mode) if touch || copy_from |
There was a problem hiding this comment.
Rails/SkipsModelValidations: Avoid using touch because it skips validations.
| @@ -1,5 +1,11 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| DC_SFTP_USER = ENV['DATACOLLECTOR_FACTORY_SFTP_USER'].presence || `whoami`.strip | |||
| DC_DIR = ENV['DATACOLLECTOR_FACTORY_DIR'].presence || | |||
| Rails.configuration.datacollectors.dig(:localcollectors, 0, :path) | |||
There was a problem hiding this comment.
Layout/MultilineOperationIndentation: Align the operands of an expression in an assignment spanning multiple lines.
| datacollector_host { '127.0.0.1' } | ||
| datacollector_authentication { 'keyfile' } | ||
| datacollector_key_name { "#{Dir.home}/.ssh/id_test" } | ||
| datacollector_dir { File.join(DC_DIR, "#{name_abbreviation}-#{datacollector_method}#{datacollector_user_level_selected ? '-user' : ''}").to_s } |
There was a problem hiding this comment.
Layout/LineLength: Line is too long. [149/120]
| @@ -1,5 +1,11 @@ | |||
| # frozen_string_literal: true | |||
|
|
|||
| DC_SFTP_USER = ENV['DATACOLLECTOR_FACTORY_SFTP_USER'].presence || 'testuser' #`whoami`.strip | |||
There was a problem hiding this comment.
Layout/LeadingCommentSpace: Missing space after #.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
refactoring
Module Datacollector
separate business logic
SFTPClient
make use of the existing SFTP client wrapper that ensures the connection is closed, instead of initialising the session directly.
AdminApi device connection testing:
Next Time