Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion docs/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ You can set the following parameter:
- `url_prefix`: Defines a URL prefix (default: no prefix)
- `vhosts`: A list of virtual hosts to listen to. If not specified, it will
respond to any virtual host.
- `mtime_from_versions`: `true`/`false`: Enables or disables display
last configuration change date on nodes list from last version.
Can increase node list display time depend on used `output` realization
(default: `false`)

## Examples

Expand Down Expand Up @@ -87,4 +91,4 @@ extensions:
hide_node_vars:
- enable
- password
```
```
3 changes: 2 additions & 1 deletion lib/oxidized/web.rb
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@ def self.parse_new_configuration(configuration)
uri_prefix: normalize_uri(configuration.url_prefix? ||
DEFAULT_URI_PREFIX),
vhosts: configuration.vhosts? || [],
hide_node_vars: hide_node_vars
hide_node_vars: hide_node_vars,
mtime_from_versions: configuration.mtime_from_versions? || false
}
end

Expand Down
20 changes: 20 additions & 0 deletions lib/oxidized/web/webapp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ class WebApp < Sinatra::Base
node[:status] = node[:last][:status]
node[:time] = node[:last][:end]
end
if settings.configuration[:mtime_from_versions] == true
set_mtime_from_versions(node)
end
node
end
out :nodes
Expand All @@ -61,6 +64,9 @@ class WebApp < Sinatra::Base
node[:status] = node[:last][:status]
node[:time] = node[:last][:end]
end
if settings.configuration[:mtime_from_versions] == true
set_mtime_from_versions(node)
end
node
end
out :nodes
Expand Down Expand Up @@ -351,6 +357,20 @@ def filter_node_vars(serialized_node)

data
end

# set node last changed time to last version time
# potential can be long operation
def set_mtime_from_versions(node)
if node[:mtime] == 'unknown' || node[:mtime].nil?
group = node[:group] == 'default' ? nil : node[:group]
versions = nodes.version(node[:name], group)
if versions.is_a?(Array) && !versions.empty? && versions.first[:time]
node[:mtime] = versions.first[:time]
end
end
node
end

end
end
end