search

kennedyshead / aioasuswrt

MIT License
24 stars 24 forks source link

feature: Nicer handling of disconnects #68

Open JJdeVries opened 3 years ago

JJdeVries commented 3 years ago

Cleanup of some common code between the two connections (ssh and telnet). Mainly reverted the locks and retries to a common class. This also adds locking to the SshConnection as there were some race issues there as well.

kennedyshead commented 3 years ago

It would be great if you could rebase this @JJdeVries

kennedyshead commented 3 years ago

This one should be a start of a major version upgrade imo! We should create a devel-branch and move this to that one. It requires alfa-testing from different setups so we don't accidentally break someones system.

kennedyshead commented 3 years ago

@JJdeVries Can you have a quick look here just to be sure I didnt break anything when I fixed the merge-conflict? Then its good to go IMO

JJdeVries commented 3 years ago

@kennedyshead @Chen-IL It seems that the commit 12717cd6 by @Chen-IL has changed all the line-endings in the asuswrt.py file from unix (\r\n) to dos (\n). This is rather unfortunate as now this branch has a lot of merge conflicts, and the git blame functionality is unusable as everything is now last changed by @Chen-IL .

I'm not really sure why this was not picked up during the review, as probably the entire file was shown in the diff?

Regarding this pull request. I've pushed a commit to also change the line-endings of asuswrt.py to [dos], although probably the result will be that now my name (and this specific commit) will show up in the git blame logging.

@Chen-IL please unsure you fix your editor to not overwrite the line-endings on saving the file, but to keep the current configured style.