EDCD / EDMarketConnector

Downloads commodity market and other station data from the game Elite: Dangerous for use with all popular online and offline trading tools.
GNU General Public License v2.0
987 stars 155 forks source link

Killswitches are no longer found #2252

Closed chennin closed 3 weeks ago

chennin commented 3 weeks ago

Please complete the following information:

Describe the bug

Killswitches seem to have disappeared. The log contains the following, and both killswitch URLs are currently 404ing

2024-06-06 16:45:37.155 UTC - INFO - 66301:126246759634752:66301 killswitch.fetch_kill_switches:346: Attempting to fetch kill switches
2024-06-06 16:45:37.232 UTC - WARNING - 66301:126246759634752:66301 killswitch.fetch_kill_switches:361: Failed to get kill switches, data was invalid: Extra data: line 1 column 4 (char 3)
2024-06-06 16:45:37.233 UTC - WARNING - 66301:126246759634752:66301 killswitch.get_kill_switches:447: could not get killswitches, trying fallback
2024-06-06 16:45:37.234 UTC - INFO - 66301:126246759634752:66301 killswitch.fetch_kill_switches:346: Attempting to fetch kill switches
2024-06-06 16:45:37.315 UTC - WARNING - 66301:126246759634752:66301 killswitch.fetch_kill_switches:361: Failed to get kill switches, data was invalid: Extra data: line 1 column 4 (char 3)
2024-06-06 16:45:37.316 UTC - WARNING - 66301:126246759634752:66301 killswitch.get_kill_switches:451: Could not get killswitches.

https://github.com/EDCD/EDMarketConnector/blob/f93485ec36b8e245b98010a710c708091ac1cc50/killswitch.py#L25-L26

To Reproduce Steps to reproduce the behavior:

Run EDMC and look at the log/output

Expected behavior

As a user, I have no idea if this is visible or not

Logs EDMarketConnector-debug.log

Rixxan commented 3 weeks ago

Looks like some cleanup attempts on our repo messed that up. I'll have it fixed in 4 hours or so when I get off work.

Athanasius commented 3 weeks ago

The weird thing is I just cannot find the commit in releases that removed the file.

git log --name-status --full-history -- killswitches_v2.json - Has the 'A' line for when it was added, no 'D' line, just a whole lot of merges. git log --diff-filter=D --summary - Also doesn't show the file at all, but does show other file deletions.

It feels like something has become very broken with the git commit history, at least for me locally. How can a file, that clearly shows as having been added in f833afdb8b6f12a72bee9822f5e89cfd9dd80883 , that has no deletion logged, not be present ?

Rixxan commented 3 weeks ago

A similar thing happened with the edmarketconnector.xml files. I'll just commit a new version from the last good version I can find later today and essentially re-create them.

Athanasius commented 3 weeks ago

Yeah, in this case no live actual killswitch was ever added, so the content just needs to be:

{
    "version": 2,
    "last_updated": "18 October 2021",
    "kill_switches": []
}
Rixxan commented 3 weeks ago

Re-added. Thank you for the report and catch!